]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'rcu/rcu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 04:24:19 +0000 (14:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 04:24:19 +0000 (14:24 +1000)
commitcd0d5c39d441325428129aefb6c4cbfbf646a740
treebd3eed3f7736088c4af7ee435702c91d0dfc6918
parent2225b877024eef3b3f3a132cffb04519e074cbec
parent5e9c338fddb1a9af8abea27809a9152586f3dc41
Merge remote-tracking branch 'rcu/rcu/next'

Conflicts:
arch/Kconfig
arch/x86/Kconfig
kernel/rcutree.h
kernel/rcutree_plugin.h
kernel/sched/core.c
15 files changed:
Documentation/kernel-parameters.txt
arch/Kconfig
arch/alpha/kernel/process.c
arch/parisc/kernel/process.c
arch/x86/Kconfig
arch/x86/kernel/entry_64.S
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