]> 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>
Tue, 17 Apr 2012 03:34:11 +0000 (13:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 03:34:11 +0000 (13:34 +1000)
commita2c21365c81bd1c56696258d86dac60a6649711c
treeb5ab1264e2effe912431037b1f7dbd21a5bfe929
parenta8331453521da88f99ca5c32dee3d02019e0ea9f
parent0ba45145922f283b30c7f1a4e5da753ae39ec174
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/mach-omap2/board-generic.c
MAINTAINERS