summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2017-03-24 18:14:50 +0100
committerFlorian Fainelli <f.fainelli@gmail.com>2017-03-24 18:14:50 +0100
commit38b06b9d00f7d4907fc18866ec766253aa34f1c6 (patch)
tree76e2d156ea1ae5baba73fd9c48daaa17cf148e6f /MAINTAINERS
parentMAINTAINERS: Add Jon Mason to BCM5301X maintainers (diff)
parentMAINTAINERS: Add Stefan Wahren to bcm2835. (diff)
downloadlinux-38b06b9d00f7d4907fc18866ec766253aa34f1c6.tar.xz
linux-38b06b9d00f7d4907fc18866ec766253aa34f1c6.zip
Merge tag 'bcm2835-maintainers-next-2017-03-21' into maintainers/next
This pull request updates the MAINTAINERS file for BCM283x for 4.12. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e402c4a5bbb3..cff8ddb7e2c1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2649,9 +2649,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