diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-10-25 15:33:38 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-10-25 15:33:38 +0200 |
commit | 6767d05ed8f902ee3fcdc2e42cccb29524cf19e5 (patch) | |
tree | fb44146fb3f2822f04985893104ca7b6434b9fd0 /drivers | |
parent | Merge tag 'cleanup-for-3.8' of git://server.prisktech.co.nz/git/linuxwmt into... (diff) | |
parent | ARM: imx: select HAVE_IMX_SRC when SMP is enabled (diff) | |
download | linux-6767d05ed8f902ee3fcdc2e42cccb29524cf19e5.tar.xz linux-6767d05ed8f902ee3fcdc2e42cccb29524cf19e5.zip |
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>
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions