]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 06:11:23 +0000 (17:11 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 06:11:23 +0000 (17:11 +1100)
commit1bdead39c01e900f0ef751af81032d660335996a
tree59dad9c5a89ece76ce29022a5c146efe3125e2a0
parent3e1ec2c3bd6ccd3eb89c3a8309f02811c4c43cf8
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