Commit 6b62a007 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'arm-soc/for-4.12/maintainers' of...

Merge tag 'arm-soc/for-4.12/maintainers' of http://github.com/Broadcom/stblinux into next/fixes-non-critical

Pull "Broadcom maintainers changes for 4.12" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoCs MAINTAINERS file updates for
4.12, please pull the following:

- Jon adds himself as a maintainer for the BCM5301X SoCs (Northstar) since he has
  been contributing changes to these platforms for a while now

- Stephen Warren removes himself from the BCM2835 maintainers (Rasperrby Pi) since
  in his own words he has not been active that much lately

- Eric adds Stefan Wahren as a maintainer for the BCM2835 platform since he has
  been very active on it for neary 2 years now

* tag 'arm-soc/for-4.12/maintainers' of http://github.com/Broadcom/stblinux:
  MAINTAINERS: Add Stefan Wahren to bcm2835.
  MAINTAINERS: remove swarren from bcm2835
  MAINTAINERS: Add Jon Mason to BCM5301X maintainers
parents aa9daa31 38b06b9d
...@@ -2650,9 +2650,9 @@ N: kona ...@@ -2650,9 +2650,9 @@ N: kona
F: arch/arm/mach-bcm/ F: arch/arm/mach-bcm/
BROADCOM BCM2835 ARM ARCHITECTURE BROADCOM BCM2835 ARM ARCHITECTURE
M: Stephen Warren <swarren@wwwdotorg.org>
M: Lee Jones <lee@kernel.org> M: Lee Jones <lee@kernel.org>
M: Eric Anholt <eric@anholt.net> M: Eric Anholt <eric@anholt.net>
M: Stefan Wahren <stefan.wahren@i2se.com>
L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
T: git git://github.com/anholt/linux T: git git://github.com/anholt/linux
...@@ -2672,12 +2672,14 @@ F: arch/mips/include/asm/mach-bcm47xx/* ...@@ -2672,12 +2672,14 @@ F: arch/mips/include/asm/mach-bcm47xx/*
BROADCOM BCM5301X ARM ARCHITECTURE BROADCOM BCM5301X ARM ARCHITECTURE
M: Hauke Mehrtens <hauke@hauke-m.de> M: Hauke Mehrtens <hauke@hauke-m.de>
M: Rafał Miłecki <zajec5@gmail.com> M: Rafał Miłecki <zajec5@gmail.com>
M: Jon Mason <jonmason@broadcom.com>
M: bcm-kernel-feedback-list@broadcom.com M: bcm-kernel-feedback-list@broadcom.com
L: linux-arm-kernel@lists.infradead.org L: linux-arm-kernel@lists.infradead.org
S: Maintained S: Maintained
F: arch/arm/mach-bcm/bcm_5301x.c F: arch/arm/mach-bcm/bcm_5301x.c
F: arch/arm/boot/dts/bcm5301x*.dtsi F: arch/arm/boot/dts/bcm5301x*.dtsi
F: arch/arm/boot/dts/bcm470* F: arch/arm/boot/dts/bcm470*
F: arch/arm/boot/dts/bcm953012*
BROADCOM BCM53573 ARM ARCHITECTURE BROADCOM BCM53573 ARM ARCHITECTURE
M: Rafał Miłecki <rafal@milecki.pl> M: Rafał Miłecki <rafal@milecki.pl>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment