]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/move' into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Dec 2011 15:48:54 +0000 (15:48 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 16 Dec 2011 15:48:54 +0000 (15:48 +0000)
commit360e7a55b64bf82efed86b307106c30bcc71acf4
treec2ffac67608d67b5511590f395984f285437f75a
parentf728a1f5d4e3ab5f6ebc8f2046a41b3fa2ff4f01
parent3f07f355704bc2ae26399f17c6d5d46c9a3d78d1
Merge branch 'next/move' into for-next

Conflicts:
arch/arm/mach-imx/Kconfig
arch/arm/plat-mxc/Kconfig
13 files changed:
arch/arm/arm-soc-for-next-contents.txt
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/Makefile.boot
arch/arm/mach-imx/clock-mx51-mx53.c
arch/arm/mach-imx/cpu-imx5.c
arch/arm/mach-imx/imx51-dt.c
arch/arm/mach-imx/imx53-dt.c
arch/arm/mach-imx/mach-mx51_babbage.c
arch/arm/mach-imx/mach-mx53_evk.c
arch/arm/mach-imx/mach-mx53_loco.c
arch/arm/mach-imx/mach-mx53_smd.c
arch/arm/mach-imx/mm-imx5.c
arch/arm/plat-mxc/Kconfig