Merge tag 'for-3.17/bcm-soc' of git://github.com/broadcom/mach-bcm into next/soc
authorArnd Bergmann <arnd@arndb.de>
Mon, 28 Jul 2014 15:25:43 +0000 (17:25 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 28 Jul 2014 15:25:43 +0000 (17:25 +0200)
commit21b9554e7b5388c84400334683e6e4cc821bdb3e
tree0806a711ab0d19c11d8d6517a7d48835e87b9b7e
parent5be42f334b90e0a8513b4af2df28b277201743e0
parent2df94fd66a1135f887bfabef413b568969f5d77b
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>
MAINTAINERS
arch/arm/configs/multi_v7_defconfig