]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'rcu/rcu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Sep 2012 04:39:14 +0000 (14:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Sep 2012 04:39:14 +0000 (14:39 +1000)
commit0edaa0542174dba2a92817a8ad579864273eb401
treea9246265676272b8e6115cae1f10f1626a0db446
parentf54a58788e567a10b25bdb56a7690610bb0dffff
parent17da987761a9f924ee4172b033a8b77c2ee24cf2
Merge remote-tracking branch 'rcu/rcu/next'

Conflicts:
arch/Kconfig
arch/x86/Kconfig
kernel/rcutree.h
kernel/rcutree_plugin.h
13 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