]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'xilinx/arm-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Nov 2012 23:09:57 +0000 (10:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Nov 2012 23:09:57 +0000 (10:09 +1100)
1  2 
arch/arm/Kconfig

Simple merge