]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 02:12:33 +0000 (13:12 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 02:12:33 +0000 (13:12 +1100)
commitafbc445720041215d2a08bce61a4ca095fdbaafe
tree5629a7351d06c44ae24c4053a514f0d73d6e4755
parent05c206d325a5b1e21a57ad4bdd3292c9c5acb9ce
parentab872c84c2ddfb14b91099e20b699f637449b5de
Merge remote-tracking branch 'pinctrl/for-next'

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