]> 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, 12 Sep 2012 04:12:18 +0000 (14:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 04:12:18 +0000 (14:12 +1000)
commitc8adae69a0b256107047966608e3aa9290902f56
treeb446639f1ab9f9ad946b3ea668aadec9c2df7aa7
parenteb6df0085e0e18007f3ce8f28256970f4b5ee18f
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