Merge branch 'late/fixes' into fixes
authorOlof Johansson <olof@lixom.net>
Thu, 9 May 2013 20:05:00 +0000 (13:05 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 9 May 2013 20:05:15 +0000 (13:05 -0700)
commit5497e7b8967118ee45f8ef2d301fce919a35d660
treeef4633712579d9a06fce69c0748580fe05ca19ab
parent8cbc95ee748741939222c3d38584a40c92bedcdd
parenteb16d33273532533400cb95189aa50d6b734db57
Merge branch 'late/fixes' into fixes

* late/fixes:
  ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP
  ARM: ux500: always select ABX500_CORE
  ARM: SIRF: select SMP_ON_UP only on SMP builds
  ARM: SPEAr: conditionalize l2x0 support
  ARM: imx: build CPU suspend code only when needed
  ARM: OMAP: build SMP code only for OMAP4/5
  ARM: tegra: Tegra114 needs CPU_FREQ_TABLE
  ARM: default machine descriptor for multiplatform

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/Kconfig
arch/arm/configs/omap2plus_defconfig
arch/arm/kernel/setup.c
arch/arm/mach-imx/headsmp.S
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Makefile
arch/arm/mach-prima2/Kconfig
arch/arm/mach-spear/spear13xx.c
arch/arm/mach-tegra/Kconfig
arch/arm/mach-ux500/Kconfig