]> 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, 9 Nov 2011 01:49:25 +0000 (12:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 9 Nov 2011 01:49:25 +0000 (12:49 +1100)
commit7ce15576b10fd1154126417a8df8e6e4894a804f
tree7b7e1d11c393beaf2d6880b7750bef9a9c50928e
parente07960ea990e5d2be5506485110a99de85fcf0fc
parentab872c84c2ddfb14b91099e20b699f637449b5de
Merge remote-tracking branch 'pinctrl/for-next'

Conflicts:
arch/arm/mach-u300/Kconfig
arch/arm/mach-u300/core.c
drivers/pinctrl/core.c