]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 06:25:01 +0000 (17:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 06:25:01 +0000 (17:25 +1100)
commit7a6c666f4f8877587220181be0e693db8f69a199
tree60b4c7d604d4d97d47361f31433245149a6dcd3d
parent0a653243681d50832ca9a082471a1efda3b3db8a
parent2a61b57f2c043e65db40e1161c34d49f4fe3c0f3
Merge remote-tracking branch 'pinctrl/for-next'

Conflicts:
arch/arm/mach-u300/Kconfig
arch/arm/mach-u300/core.c
MAINTAINERS
arch/arm/mach-u300/Kconfig
arch/arm/mach-u300/core.c
arch/arm/mach-u300/mmc.c
drivers/Kconfig
drivers/Makefile