Skip to content

Commit d6ad446

Browse files
committed
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
2 parents 654758a + 1de2a66 commit d6ad446

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2116,8 +2116,9 @@ S: Supported
21162116
F: drivers/net/ethernet/broadcom/bnx2x/
21172117

21182118
BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
2119-
M: Christian Daudt <[email protected]>
21202119
M: Florian Fainelli <[email protected]>
2120+
M: Ray Jui <[email protected]>
2121+
M: Scott Branden <[email protected]>
21212122
21222123
T: git git://github.com/broadcom/mach-bcm
21232124
S: Maintained
@@ -2168,7 +2169,6 @@ S: Maintained
21682169
F: drivers/usb/gadget/udc/bcm63xx_udc.*
21692170

21702171
BROADCOM BCM7XXX ARM ARCHITECTURE
2171-
M: Marc Carino <[email protected]>
21722172
M: Brian Norris <[email protected]>
21732173
M: Gregory Fong <[email protected]>
21742174
M: Florian Fainelli <[email protected]>

0 commit comments

Comments
 (0)