diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-07 18:24:32 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-07 18:24:32 +0200 |
| commit | d6ad446dd75ef58bd383987e35ffd90d564f8080 (patch) | |
| tree | ba1f620e9a034f9486268dfc1f34bca74176329b /MAINTAINERS | |
| parent | 654758ae09b4257f2f79c46ade01f973990d63f0 (diff) | |
| parent | 1de2a662d0f2d3b211b7d10ea6578abe5c39eda3 (diff) | |
| download | blackbird-op-linux-d6ad446dd75ef58bd383987e35ffd90d564f8080.tar.gz blackbird-op-linux-d6ad446dd75ef58bd383987e35ffd90d564f8080.zip | |
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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 781e099495d3..f639c04c8098 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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> |
