diff options
| author | Olof Johansson <[email protected]> | 2015-01-15 16:15:08 -0800 |
|---|---|---|
| committer | Olof Johansson <[email protected]> | 2015-01-15 16:15:08 -0800 |
| commit | 8614f9f7fc8fe569341be447277d52c44731c41a (patch) | |
| tree | 1615d0559887973226ff967727bee97a511a3be8 | |
| parent | eaa27f34e91a14cdceed26ed6c6793ec1d186115 (diff) | |
| parent | 0048f5f3790dc4aa0d22c2612fadf39b3696b439 (diff) | |
Merge tag 'arm-soc/for-3.20/maintainer' of http://github.com/broadcom/stblinux into next/fixes-non-critical
Merge "Broadcom MAINTAINERS file updates for 3.20" from Florian Fainelli:
This pull request contains updates to our MAINTAINERS files for all relevant
Broadcom SoCs: BCM63xx, Cygnus/iProc, ARM & MIPS-based BCM7xxx (brcmstb).
Our new code location for all Broadcom-related kernel activities is now on
http://github.com/broadcom/.
* tag 'arm-soc/for-3.20/maintainer' of http://github.com/broadcom/stblinux:
MAINTAINERS: add a git entry for BMIPS-based BCM7xxx SoCs
MAINTAINERS: add a git entry for BCM7xxx ARM-based SoCs
MAINTAINERS: update Broadcom Cygnus SoC git tree
MAINTAINERS: move BCM63xx ARM-based SoCs git tree
Signed-off-by: Olof Johansson <[email protected]>
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3589d67437f8..b04053f70cb1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2124,7 +2124,7 @@ F: arch/arm/boot/dts/bcm470* BROADCOM BCM63XX ARM ARCHITECTURE M: Florian Fainelli <[email protected]> -T: git git://git.github.com/brcm/linux.git +T: git git://git.github.com/broadcom/arm-bcm63xx.git S: Maintained F: arch/arm/mach-bcm/bcm63xx.c F: arch/arm/include/debug/bcm63xx.S @@ -2141,6 +2141,7 @@ M: Brian Norris <[email protected]> M: Gregory Fong <[email protected]> M: Florian Fainelli <[email protected]> L: [email protected] (moderated for non-subscribers) +T: git git://git.github.com/broadcom/stblinux.git S: Maintained F: arch/arm/mach-bcm/*brcmstb* F: arch/arm/boot/dts/bcm7*.dts* @@ -2150,6 +2151,7 @@ BROADCOM BMIPS MIPS ARCHITECTURE M: Kevin Cernekee <[email protected]> M: Florian Fainelli <[email protected]> +T: git git://git.github.com/broadcom/stblinux.git S: Maintained F: arch/mips/bmips/* F: arch/mips/include/asm/mach-bmips/* @@ -2192,7 +2194,7 @@ M: Ray Jui <[email protected]> M: Scott Branden <[email protected]> L: [email protected] (moderated for non-subscribers) -T: git git://git.github.com/brcm/linux.git +T: git git://git.github.com/broadcom/cygnus-linux.git S: Maintained N: iproc N: cygnus |