]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/board' of git+ssh://git.linaro.org/home/arndbergmann/public_git...
authorArnd Bergmann <arnd@arndb.de>
Sat, 10 Sep 2011 21:40:53 +0000 (23:40 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 10 Sep 2011 21:40:53 +0000 (23:40 +0200)
commitbe4856318ab5ef8a6d6cef1bf0ff45bd79a8b58f
tree9a6bf0a3752fb09881c250fcc6bfff1611a5342a
parentfb3cc8bd24fbf454d6c9abba1dbd22098890c0c4
parent72787aa866bfa6bcbd259e7a39b2f9a2f412794e
Merge branch 'next/board' of git+ssh://git.linaro.org/home/arndbergmann/public_git/arm-soc into for-next

Conflicts:
arch/arm/mach-imx/mach-cpuimx27.c
arch/arm/Kconfig
arch/arm/kernel/setup.c
arch/arm/mach-imx/mach-cpuimx27.c
arch/arm/mach-imx/mach-cpuimx35.c
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
arch/arm/mach-shmobile/board-ag5evm.c
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-mackerel.c
arch/arm/mach-vexpress/v2m.c