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 <[email protected]>
Sonicadvance1 · Oct 16, 2019 · aa76f25 · aa76f25
2 parents 54ecb8f + a91f757
commit aa76f25
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.mailmap b/.mailmap
@@ -229,6 +229,7 @@ Shuah Khan <[email protected]> <[email protected]>
 Shuah Khan <[email protected]> <[email protected]>
 Shuah Khan <[email protected]> <[email protected]>
 Shuah Khan <[email protected]> <[email protected]>
+Simon Arlott <[email protected]> <[email protected]>
 Simon Kelley <[email protected]>
 Stéphane Witzmann <[email protected]>
 Stephen Hemminger <[email protected]>

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -3187,14 +3187,15 @@ 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]>
 L:	[email protected]
 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