aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS5
2 files changed, 3 insertions, 3 deletions
diff --git a/.mailmap b/.mailmap
index edcac87e76c8..f652f3725772 100644
--- a/.mailmap
+++ b/.mailmap
@@ -229,6 +229,7 @@ Shuah Khan <[email protected]> <[email protected]>
Simon Kelley <[email protected]>
Stéphane Witzmann <[email protected]>
Stephen Hemminger <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index baac17ad16d6..94edb673dca5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3189,7 +3189,7 @@ N: bcm216*
N: kona
F: arch/arm/mach-bcm/
-BROADCOM BCM2835 ARM ARCHITECTURE
+BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
M: Eric Anholt <[email protected]>
M: Stefan Wahren <[email protected]>
@@ -3197,6 +3197,7 @@ L: [email protected] (moderated for non-subscribers)
L: [email protected] (moderated for non-subscribers)
T: git git://github.com/anholt/linux
S: Maintained
+N: bcm2711
N: bcm2835
F: drivers/staging/vc04_services
@@ -3243,8 +3244,6 @@ S: Maintained
F: drivers/usb/gadget/udc/bcm63xx_udc.*
BROADCOM BCM7XXX ARM ARCHITECTURE
-M: Brian Norris <[email protected]>
-M: Gregory Fong <[email protected]>
M: Florian Fainelli <[email protected]>
L: [email protected] (moderated for non-subscribers)