]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'rcu/rcu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 04:53:14 +0000 (14:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 04:53:14 +0000 (14:53 +1000)
commit8eab94c61b5013840580602b1dfaf7b31de2c64f
treeb1046c932c86d14329d2419af7d1827ba0cfb34b
parent483b4f2bbe79e0fdacbf4a019bf5ce1030d89b65
parentf417d2b3f060864ee8fd187b0145288fb95515e8
Merge remote-tracking branch 'rcu/rcu/next'

Conflicts:
arch/Kconfig
arch/x86/Kconfig
kernel/rcutree.h
kernel/rcutree_plugin.h
kernel/sched/core.c
16 files changed:
Documentation/kernel-parameters.txt
arch/Kconfig
arch/x86/Kconfig
arch/x86/kernel/entry_64.S
arch/x86/kernel/ptrace.c
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
kernel/time/tick-sched.c
lib/Kconfig.debug