]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'userns/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 02:44:47 +0000 (12:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 02:44:47 +0000 (12:44 +1000)
1  2 
init/Kconfig

diff --cc init/Kconfig
Simple merge