]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 04:26:38 +0000 (15:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 04:26:38 +0000 (15:26 +1100)
commit39d598002f7e1b2a8448fbd661d960206a88a32c
treee11d37e66637ce5e31237416632a2cd3b265fe5c
parentc61aa250a7d9eb2946e85fbf4306888cf9e59b7d
parentab872c84c2ddfb14b91099e20b699f637449b5de
Merge remote-tracking branch 'pinctrl/for-next'

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