]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 27 Jun 2014 02:10:38 +0000 (12:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 27 Jun 2014 02:10:38 +0000 (12:10 +1000)
1  2 
Documentation/kernel-parameters.txt
kernel/smp.c

Simple merge
diff --cc kernel/smp.c
Simple merge