]> 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, 6 Oct 2011 05:21:22 +0000 (16:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 05:21:22 +0000 (16:21 +1100)
commitb39c667bb4eb300a7f8d9458c139850acbbd0c26
tree3c4920ca0ca6772bc87fc51f98b86778191f716f
parentdbe8a1dbf1692186936a41465af773eae8f51558
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