]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'rcu/rcu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 22 Aug 2012 04:27:16 +0000 (14:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 22 Aug 2012 04:27:16 +0000 (14:27 +1000)
commita54c75d7130d5d57dddeea2b25a4572710248d80
tree9cea3c4b0c1aea2f55e5a25fb10fd2e405e634db
parent0a1679ceae216604d5dd8722e89b754f535eae27
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