]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'tegra/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 6 Nov 2011 23:37:03 +0000 (10:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 6 Nov 2011 23:37:03 +0000 (10:37 +1100)
1  2 
arch/arm/Kconfig

Simple merge