]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'rcu/rcu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 03:56:58 +0000 (13:56 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 03:56:58 +0000 (13:56 +1000)
commit8cb0abf29778c2605b46577c7d9ba9245e9ba111
treeecf3bdf5726974b11751110eaefb62418fa3dda3
parentcc9b6f56579ba3912d0c9bf109fcace71566c645
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