]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/cross-platform' of git+ssh://git.linaro.org/home/arndbergmann...
authorArnd Bergmann <arnd@arndb.de>
Sat, 10 Sep 2011 21:44:09 +0000 (23:44 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 10 Sep 2011 21:44:09 +0000 (23:44 +0200)
commitb78777b466d315f280f4cc5160485e10921b1830
tree520a2c8c4f1e5641edf9188d365f17c8f99936ad
parentbe4856318ab5ef8a6d6cef1bf0ff45bd79a8b58f
parent5efeaff08a5274727fa57c03c3d864cf1980194b
Merge branch 'next/cross-platform' of git+ssh://git.linaro.org/home/arndbergmann/public_git/arm-soc into for-next

Conflicts:
arch/arm/mach-u300/Makefile.boot
arch/arm/Kconfig
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/kernel/setup.c
arch/arm/mach-pxa/saar.c