]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'tip/auto-latest'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 02:37:38 +0000 (13:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 02:37:38 +0000 (13:37 +1100)
1  2 
Documentation/kernel-parameters.txt
kernel/sched.c

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