Merge branch 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2...
authorArnd Bergmann <arnd@arndb.de>
Thu, 25 Oct 2012 13:33:38 +0000 (15:33 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 25 Oct 2012 13:33:38 +0000 (15:33 +0200)
Two bug fixes for the imx multi-platform support.

* 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx: select HAVE_IMX_SRC when SMP is enabled
  ARM: mach-imx: Fix selection of ARCH_MXC

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge