]> 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>
Sun, 6 Nov 2011 23:32:50 +0000 (10:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 6 Nov 2011 23:32:53 +0000 (10:32 +1100)
commitf6bc2ce907d6aaf97afc4f7c5f81f44a4db15116
treed6a9e2ff0ca037fbb28b20aff36099dd67a0869d
parent6855edc8ea42c9509d809ffe9785e9197895f4f4
parenta238f824a15f62389c48d5c1ff456fa3ad9ecbca
Merge remote-tracking branch 'arm-soc/for-next'

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