]> 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>
Fri, 4 Nov 2011 01:08:16 +0000 (12:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 01:08:19 +0000 (12:08 +1100)
commitf65506d7a54ec86873a90a9acd236f810dcc1672
tree8a5ba927d2acd01d732c2f3142000ef4d5c5f90c
parenteffc682a3baed0d7351cf157ef38fdb0b2a18fd7
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
drivers/gpio/Kconfig