]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'tegra/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 02:25:44 +0000 (13:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 02:25:44 +0000 (13:25 +1100)
1  2 
arch/arm/Kconfig

Simple merge