diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-07-28 17:25:43 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-07-28 17:25:43 +0200 |
| commit | 21b9554e7b5388c84400334683e6e4cc821bdb3e (patch) | |
| tree | 0806a711ab0d19c11d8d6517a7d48835e87b9b7e /MAINTAINERS | |
| parent | 5be42f334b90e0a8513b4af2df28b277201743e0 (diff) | |
| parent | 2df94fd66a1135f887bfabef413b568969f5d77b (diff) | |
| download | talos-op-linux-21b9554e7b5388c84400334683e6e4cc821bdb3e.tar.gz talos-op-linux-21b9554e7b5388c84400334683e6e4cc821bdb3e.zip | |
Merge tag 'for-3.17/bcm-soc' of git://github.com/broadcom/mach-bcm into next/soc
Merge "ARM: mach-bcm: soc updates for 3.17" from Matt Porter:
- BCM Mobile SMP support
- BRCM STB platform support
* tag 'for-3.17/bcm-soc' of git://github.com/broadcom/mach-bcm:
MAINTAINERS: add entry for Broadcom ARM STB architecture
ARM: brcmstb: select GISB arbiter and interrupt drivers
ARM: brcmstb: add infrastructure for ARM-based Broadcom STB SoCs
ARM: configs: enable SMP in bcm_defconfig
ARM: add SMP support for Broadcom mobile SoCs
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fb784e03db0d..5d3b0ccaa90a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1978,6 +1978,14 @@ F: arch/arm/mach-bcm/bcm_5301x.c F: arch/arm/boot/dts/bcm5301x.dtsi F: arch/arm/boot/dts/bcm470* +BROADCOM BCM7XXX ARM ARCHITECTURE +M: Marc Carino <marc.ceeeee@gmail.com> +M: Brian Norris <computersforpeace@gmail.com> +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +S: Maintained +F: arch/arm/mach-bcm/*brcmstb* +F: arch/arm/boot/dts/bcm7*.dts* + BROADCOM TG3 GIGABIT ETHERNET DRIVER M: Nithin Nayak Sujir <nsujir@broadcom.com> M: Michael Chan <mchan@broadcom.com> |
