Merge tag 'arm-soc/for-3.19/cygnus-platform-v2' of http://github.com/brcm/linux into...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 12:05:39 +0000 (13:05 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Nov 2014 12:05:39 +0000 (13:05 +0100)
commit950e619a98ee5a6d29c8d6422fec47009f7de29f
tree786c1fcf4aec30f751e1cd1cb2226a3db2f3bee7
parente6131fa3835483944c13d03bcff1d9103d9f53ce
parent64e74aa788f996cd0e328a1c4223e9d438b78e9c
Merge tag 'arm-soc/for-3.19/cygnus-platform-v2' of github.com/brcm/linux into next/soc

Pull "Broadcom Cygnus SoC platform support" from Florian Fainelli:

This pull request contains the platform code to support the Broadcom Cygnus SoC
using the iProc architecture:

- add support for the Broadcom Cygnus SoC
- consolidate the BCM5301X Kconfig options under the iProc menuconfig entry
- remove one level of menu in menuconfig

* tag 'arm-soc/for-3.19/cygnus-platform-v2' of http://github.com/brcm/linux:
  ARM: mach-bcm: ARCH_BCM_MOBILE: remove one level of menu from Kconfig
  ARM: mach-bcm: Consolidate currently supported IPROC SoCs
  ARM: cygnus: Initial support for Broadcom Cygnus SoC

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-bcm/Kconfig
arch/arm/mach-bcm/Makefile