Unverified Commit aa76f25e authored by Florian Fainelli's avatar Florian Fainelli
Browse files

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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 54ecb8f7 a91f757b

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> 
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>

Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>

Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>

Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>

Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <shemminger@osdl.org>

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -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

















































































CRA Git | Maintained and supported by SUSTech CRA and CCSE