]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'rcu/rcu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 04:50:03 +0000 (14:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 04:50:03 +0000 (14:50 +1000)
commit9b1eaa53deba3ee4a40df6fc893087dde9f1dc3e
tree853f32f872874113b6e7ec605736d403774e353e
parent4c274406216ceb51d6e0cc2495685998885ddda0
parentd1d61c117a7be3ad34bee463ef657f6f51b3046f
Merge remote-tracking branch 'rcu/rcu/next'

Conflicts:
arch/Kconfig
arch/x86/Kconfig
include/linux/sched.h
kernel/rcutree.h
kernel/rcutree_plugin.h
15 files changed:
Documentation/kernel-parameters.txt
arch/Kconfig
arch/um/drivers/mconsole_kern.c
arch/x86/Kconfig
arch/x86/kernel/entry_64.S
arch/x86/kernel/signal.c
arch/x86/kernel/traps.c
include/linux/sched.h
init/Kconfig
kernel/rcutree.c
kernel/rcutree.h
kernel/rcutree_plugin.h
kernel/rcutree_trace.c
kernel/sched/core.c
lib/Kconfig.debug