]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'rcu/rcu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 04:23:50 +0000 (15:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 04:23:50 +0000 (15:23 +1100)
1  2 
include/linux/sched.h
init/Kconfig
kernel/lockdep.c
kernel/sched.c
kernel/time/tick-sched.c

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