]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 9 Dec 2013 23:36:23 +0000 (10:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 9 Dec 2013 23:36:23 +0000 (10:36 +1100)
1  2 
arch/arm/mach-at91/setup.c
arch/arm/mach-ux500/setup.h

Simple merge
Simple merge