Merge tag 'bcm-for-3.13-soc2' of git://github.com/broadcom/bcm11351 into next/soc
authorOlof Johansson <olof@lixom.net>
Wed, 30 Oct 2013 21:03:39 +0000 (14:03 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 30 Oct 2013 21:03:39 +0000 (14:03 -0700)
commit6216650a7ab822b5fe3d2bb0b953486f3fb07376
tree6729d5a962437ee12a0dad7a82f18c4506a11163
parent81d6e719d1f8e1aa318f6d899f496fdf89e2f046
parent2d58b26550ad5d869118c77b3db8feb942e54be0
Merge tag 'bcm-for-3.13-soc2' of git://github.com/broadcom/bcm11351 into next/soc

From Christian Daudt, BCM changes for 3.13/soc. Mostly cleanups and
renaming of kernel config options, pushing down the mobile platforms
one level in the naming scheme, keeping ARCH_BCM as a wider family
config option.

* tag 'bcm-for-3.13-soc2' of git://github.com/broadcom/bcm11351:
  ARM: bcm_defconfig: Run "make savedefconfig"
  ARM: bcm281xx: Add ARCH Timers to config
  rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm)
  ARM: bcm281xx: more descriptive machine string
  ARM: bcm281xx: Enable GPIO driver

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/configs/multi_v7_defconfig
arch/arm/mach-bcm/board_bcm281xx.c