]> 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, 30 Sep 2011 04:18:03 +0000 (14:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 04:18:03 +0000 (14:18 +1000)
commit8b577b54f5d6ba74dae80ace03ad71081d401d4b
treea5ced77525f4d86e5e51aca7913b9a351b60bf1f
parent67db54acd23c06ccb59b351291f47b63c9ebd231
parentbb41f2392a5a29a5f980d6d661dbda0734e0915c
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