Commit 02ab7a38 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'arm-soc/for-4.4/maintainers' of http://github.com/Broadcom/stblinux...

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
parents 72affdec 63f37ddf
...@@ -2360,19 +2360,27 @@ L: linux-scsi@vger.kernel.org ...@@ -2360,19 +2360,27 @@ L: linux-scsi@vger.kernel.org
S: Supported S: Supported
F: drivers/scsi/bnx2i/ F: drivers/scsi/bnx2i/
BROADCOM CYGNUS/IPROC ARM ARCHITECTURE BROADCOM IPROC ARM ARCHITECTURE
M: Ray Jui <rjui@broadcom.com> M: Ray Jui <rjui@broadcom.com>
M: Scott Branden <sbranden@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: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L: bcm-kernel-feedback-list@broadcom.com L: bcm-kernel-feedback-list@broadcom.com
T: git git://github.com/broadcom/cygnus-linux.git T: git git://github.com/broadcom/cygnus-linux.git
S: Maintained S: Maintained
N: iproc N: iproc
N: cygnus N: cygnus
N: nsp
N: bcm9113* N: bcm9113*
N: bcm9583* N: bcm9583*
N: bcm583* N: bcm9585*
N: bcm9586*
N: bcm988312
N: bcm113* N: bcm113*
N: bcm583*
N: bcm585*
N: bcm586*
N: bcm88312
BROADCOM BRCMSTB GPIO DRIVER BROADCOM BRCMSTB GPIO DRIVER
M: Gregory Fong <gregory.0xf0@gmail.com> M: Gregory Fong <gregory.0xf0@gmail.com>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment