diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-09 17:23:33 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-09 17:23:33 +0200 |
| commit | 02ab7a3852eeb5b7429ad1edcb6afe3852cd38c3 (patch) | |
| tree | 12a94b4645316921bc82f5fc6c5588a9c52ac216 /MAINTAINERS | |
| parent | 72affdecdd4901a8a1b71b2120731498e46347a4 (diff) | |
| parent | 63f37ddf5c221c5a86ea9e45625bd0381feabc13 (diff) | |
Merge tag 'arm-soc/for-4.4/maintainers' of http://github.com/Broadcom/stblinux into next/fixes-non-critical
Merge "Broadcom maintainers changes for v4.4" from Florian Fainelli:
This pull request contains the following changes to the MAINTAINERS file:
- Jon Mason lists the NorthStar Plus SoC under the existing Cygnus/iProc section, and by
doing so, slightly rephrases the title to make it clear that it spans many more chips now
* tag 'arm-soc/for-4.4/maintainers' of http://github.com/Broadcom/stblinux:
MAINTAINERS: add entry for the Broadcom Northstar Plus SoCs
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 797236befd27..b5292ac08c09 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2360,19 +2360,27 @@ L: linux-scsi@vger.kernel.org S: Supported F: drivers/scsi/bnx2i/ -BROADCOM CYGNUS/IPROC ARM ARCHITECTURE +BROADCOM IPROC ARM ARCHITECTURE M: Ray Jui <rjui@broadcom.com> M: Scott Branden <sbranden@broadcom.com> +M: Jon Mason <jonmason@broadcom.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: bcm-kernel-feedback-list@broadcom.com T: git git://github.com/broadcom/cygnus-linux.git S: Maintained N: iproc N: cygnus +N: nsp N: bcm9113* N: bcm9583* -N: bcm583* +N: bcm9585* +N: bcm9586* +N: bcm988312 N: bcm113* +N: bcm583* +N: bcm585* +N: bcm586* +N: bcm88312 BROADCOM BRCMSTB GPIO DRIVER M: Gregory Fong <gregory.0xf0@gmail.com> |