]> 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, 17 Sep 2012 06:28:30 +0000 (16:28 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 06:28:30 +0000 (16:28 +1000)
commit8fe1fc9cae0bb338035f55a31115d7a6c8d81483
tree148920041015b34386416b94cf65cd496e6c0f68
parentc46256170d9d60b997d440f65be5f872ed49f70d
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