aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS3
2 files changed, 3 insertions, 1 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 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 <[email protected]>
M: Stefan Wahren <[email protected]>
@@ -3195,6 +3195,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