commit 5497e7b8967118ee45f8ef2d301fce919a35d660
author Olof Johansson <olof@lixom.net> Thu May 09 13:05:00 2013 -0700
committer Olof Johansson <olof@lixom.net> Thu May 09 13:05:15 2013 -0700
tree ef4633712579d9a06fce69c0748580fe05ca19ab
parent 8cbc95ee748741939222c3d38584a40c92bedcdd
parent eb16d33273532533400cb95189aa50d6b734db57

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>