From: Arnd Bergmann Date: Thu, 25 Oct 2012 13:33:38 +0000 (+0200) Subject: Merge branch 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2... X-Git-Tag: firefly_0821_release~3680^2~1485^2~20 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6767d05ed8f902ee3fcdc2e42cccb29524cf19e5;p=firefly-linux-kernel-4.4.55.git 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 --- 6767d05ed8f902ee3fcdc2e42cccb29524cf19e5