Merge branch 'imx/multi-platform' of...

Merge branch 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

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>