]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'drop-experimental/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Oct 2012 03:06:35 +0000 (14:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Oct 2012 03:06:35 +0000 (14:06 +1100)
1  2 
init/Kconfig

diff --cc init/Kconfig
Simple merge