]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 05:52:07 +0000 (16:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 05:52:07 +0000 (16:52 +1100)
commit1fac34c9e22fc2a991ef06bbd77df776d583192f
treeeaad148a0351805f8bdba1a603e9653ed0b5a304
parent20d6aed307758fe9d57bfa96a17258ca283657e4
parent7df485f1def08486198da0db1049323a34342652
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