]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'rcu/rcu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 04:37:12 +0000 (14:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 04:37:12 +0000 (14:37 +1000)
commit34ed5cbf5dc42e6b3219e725e664fa63b45d16f4
tree75eedabfbc48c9abf436970ed5c6864894c1fb85
parent06380e75b7935b423bd7f32a35b2f41772f49aa9
parentd1d61c117a7be3ad34bee463ef657f6f51b3046f
Merge remote-tracking branch 'rcu/rcu/next'

Conflicts:
arch/Kconfig
arch/x86/Kconfig
include/linux/sched.h
Documentation/kernel-parameters.txt
arch/Kconfig
arch/um/drivers/mconsole_kern.c
arch/x86/Kconfig
arch/x86/kernel/entry_64.S
arch/x86/kernel/signal.c
arch/x86/kernel/traps.c
include/linux/sched.h
init/Kconfig
kernel/sched/core.c
lib/Kconfig.debug