]> 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, 14 Oct 2011 05:45:29 +0000 (16:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 05:45:29 +0000 (16:45 +1100)
commitc89a84afd3004b3c766fb1fe6e77b9e6a03b34b4
treeb2f09a391de528e40daeda61f7aaaccc4fc2ef7f
parent2a1e55dc8db5246859abdbd191f2fa496057cbbf
parent393daa814f4bbc6f5c099178c073fae9f7ef6177
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