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