]> 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, 2 Nov 2011 04:04:06 +0000 (15:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Nov 2011 04:04:06 +0000 (15:04 +1100)
commit8862ad18594a8abafbf939ca7c426871f71e6293
tree4a9f2e715fafe1849b6195be50981f031e3a95fe
parent83cea47e7b2dd89592081647c1631a121d3b1636
parentab872c84c2ddfb14b91099e20b699f637449b5de
Merge remote-tracking branch 'pinctrl/for-next'

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