]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Oct 2011 05:29:13 +0000 (16:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Oct 2011 05:29:13 +0000 (16:29 +1100)
commit974c721dfd3e0fa0b51468048a283acf7861eda0
treeca4b2a811fd1cf7202044a5ed41b57327f14eb2c
parent0d5cd0a99fbce3e033f0053e335f4667ffd3d1a7
parent39d7f636df2e18add5dc06898bcd2187f7ec7c16
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