]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Nov 2011 07:00:17 +0000 (18:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Nov 2011 07:00:17 +0000 (18:00 +1100)
commit705862f4f189cceecbf07a430f1aa8aafc488da3
tree2d8902531fdb5f17c8de3e47e043b73843b27f7d
parent0e8c4dff8e0e107e8d65613fc8caf905e3642127
parentab872c84c2ddfb14b91099e20b699f637449b5de
Merge remote-tracking branch 'pinctrl/for-next'

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