diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-03-31 10:55:56 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-03-31 10:55:56 +0200 |
| commit | 6b62a0077b830c64d434943ffe3ab16fea00accd (patch) | |
| tree | 9ef0babff468dc9662df0ecb1998203bba737a25 /MAINTAINERS | |
| parent | aa9daa310dee3f86fa3a693fecd996a28d993cc6 (diff) | |
| parent | 38b06b9d00f7d4907fc18866ec766253aa34f1c6 (diff) | |
| download | op-kernel-dev-6b62a0077b830c64d434943ffe3ab16fea00accd.zip op-kernel-dev-6b62a0077b830c64d434943ffe3ab16fea00accd.tar.gz | |
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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ddf5826..52bf63c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2650,9 +2650,9 @@ N: kona F: arch/arm/mach-bcm/ BROADCOM BCM2835 ARM ARCHITECTURE -M: Stephen Warren <swarren@wwwdotorg.org> M: Lee Jones <lee@kernel.org> 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-arm-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://github.com/anholt/linux @@ -2672,12 +2672,14 @@ F: arch/mips/include/asm/mach-bcm47xx/* BROADCOM BCM5301X ARM ARCHITECTURE M: Hauke Mehrtens <hauke@hauke-m.de> M: Rafał Miłecki <zajec5@gmail.com> +M: Jon Mason <jonmason@broadcom.com> M: bcm-kernel-feedback-list@broadcom.com L: linux-arm-kernel@lists.infradead.org S: Maintained F: arch/arm/mach-bcm/bcm_5301x.c F: arch/arm/boot/dts/bcm5301x*.dtsi F: arch/arm/boot/dts/bcm470* +F: arch/arm/boot/dts/bcm953012* BROADCOM BCM53573 ARM ARCHITECTURE M: Rafał Miłecki <rafal@milecki.pl> |
