]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 07:29:33 +0000 (18:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 07:29:33 +0000 (18:29 +1100)
commit8b7ea5321dccf005b0e258d856290df9ec2b1de1
treeabd922d3b78482fc08d9096597214d64596fcedb
parentc49d8631f0f07a58313c1e988abd73e580c69e06
parent2a61b57f2c043e65db40e1161c34d49f4fe3c0f3
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