]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:00:33 +0000 (13:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:00:36 +0000 (13:00 +1100)
commit38f4446aa5f9296cd34d5a1bae9e52a8002147d2
tree8db84796d720f6c1df2400ad721776c549a36c52
parentaaa206a6a142154da4f91785994efe98eefa766a
parenta238f824a15f62389c48d5c1ff456fa3ad9ecbca
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/plat-omap/devices.c
arch/arm/Kconfig
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-omap2/board-generic.c