]> 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, 11 Oct 2011 08:06:49 +0000 (19:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 08:06:49 +0000 (19:06 +1100)
commit70ddb7669236251aacc00440c2e6880f6f39cba6
treed52c37de79d4b21fc0b467ed43797c1fb3374cb1
parent8276d4fdaa2441398461fdfc020a2ddb63fa41c6
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