Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6ad446d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-4.1/maintainers' of http://github.com/broadcom/stblinux into fixes 

Merge "MAINTAINERS update for Broadcom SoCs for 4.1 #2" from Florian Fainelli:

This pull request contains 3 changes to the MAINTAINERS file for Broadcom SoCs:

- add Ray and Scott for mach-bcm
- remove Christian for mach-bcm
- remove Marc for brcmstb

* tag 'arm-soc/for-4.1/maintainers' of http://github.com/broadcom/stblinux:
  MAINTAINERS: Update brcmstb entry
  MAINTAINERS: Remove Christian Daudt for mach-bcm
  MAINTAINERS: Update mach-bcm maintainers list
parents 654758ae 1de2a662

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -2116,8 +2116,9 @@ S: Supported 
F:	drivers/net/ethernet/broadcom/bnx2x/



BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE

M:	Christian Daudt <bcm@fixthebug.org>

M:	Florian Fainelli <f.fainelli@gmail.com>

M:	Ray Jui <rjui@broadcom.com>

M:	Scott Branden <sbranden@broadcom.com>

L:	bcm-kernel-feedback-list@broadcom.com

T:	git git://github.com/broadcom/mach-bcm

S:	Maintained
@@ -2168,7 +2169,6 @@ S: Maintained 
F:	drivers/usb/gadget/udc/bcm63xx_udc.*



BROADCOM BCM7XXX ARM ARCHITECTURE

M:	Marc Carino <marc.ceeeee@gmail.com>

M:	Brian Norris <computersforpeace@gmail.com>

M:	Gregory Fong <gregory.0xf0@gmail.com>

M:	Florian Fainelli <f.fainelli@gmail.com>