summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2019-10-16 15:16:14 -0700
committerFlorian Fainelli <f.fainelli@gmail.com>2019-10-16 15:16:14 -0700
commitaa76f25e37892f83ae623e7ac8d9e4456ea80181 (patch)
treedf09fb664f10175956aacec2cf71757d3d97dcd6 /MAINTAINERS
parent54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c (diff)
parenta91f757bda1a48317f692487addf832ebf8e93aa (diff)
Merge tag 'tags/bcm2835-maintainers-next-2019-10-15' into maintainers/next
This pull request clarifies maintainership of the BCM2711 and adds a replacement mail address for a former contributor. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 296de2b51c83..14a939a9e1e7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3187,7 +3187,7 @@ N: bcm216*
N: kona
F: arch/arm/mach-bcm/
-BROADCOM BCM2835 ARM ARCHITECTURE
+BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
M: Eric Anholt <eric@anholt.net>
M: Stefan Wahren <wahrenst@gmx.net>
L: bcm-kernel-feedback-list@broadcom.com
@@ -3195,6 +3195,7 @@ 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
S: Maintained
+N: bcm2711
N: bcm2835
F: drivers/staging/vc04_services