aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-10-09 11:23:33 -0400
committerArnd Bergmann <arnd@arndb.de>2015-10-09 11:23:33 -0400
commit02ab7a3852eeb5b7429ad1edcb6afe3852cd38c3 (patch)
tree12a94b4645316921bc82f5fc6c5588a9c52ac216
parent72affdecdd4901a8a1b71b2120731498e46347a4 (diff)
parent63f37ddf5c221c5a86ea9e45625bd0381feabc13 (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
-rw-r--r--MAINTAINERS12
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
2360S: Supported 2360S: Supported
2361F: drivers/scsi/bnx2i/ 2361F: drivers/scsi/bnx2i/
2362 2362
2363BROADCOM CYGNUS/IPROC ARM ARCHITECTURE 2363BROADCOM IPROC ARM ARCHITECTURE
2364M: Ray Jui <rjui@broadcom.com> 2364M: Ray Jui <rjui@broadcom.com>
2365M: Scott Branden <sbranden@broadcom.com> 2365M: Scott Branden <sbranden@broadcom.com>
2366M: Jon Mason <jonmason@broadcom.com>
2366L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 2367L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2367L: bcm-kernel-feedback-list@broadcom.com 2368L: bcm-kernel-feedback-list@broadcom.com
2368T: git git://github.com/broadcom/cygnus-linux.git 2369T: git git://github.com/broadcom/cygnus-linux.git
2369S: Maintained 2370S: Maintained
2370N: iproc 2371N: iproc
2371N: cygnus 2372N: cygnus
2373N: nsp
2372N: bcm9113* 2374N: bcm9113*
2373N: bcm9583* 2375N: bcm9583*
2374N: bcm583* 2376N: bcm9585*
2377N: bcm9586*
2378N: bcm988312
2375N: bcm113* 2379N: bcm113*
2380N: bcm583*
2381N: bcm585*
2382N: bcm586*
2383N: bcm88312
2376 2384
2377BROADCOM BRCMSTB GPIO DRIVER 2385BROADCOM BRCMSTB GPIO DRIVER
2378M: Gregory Fong <gregory.0xf0@gmail.com> 2386M: Gregory Fong <gregory.0xf0@gmail.com>