]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'rcu/rcu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 04:33:41 +0000 (14:33 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 04:33:41 +0000 (14:33 +1000)
commit7bdf846e0f44643c9f75b043f0aaac1fedbca36a
treea1e00eaebbf7b0d98f818a8fb979c142a505c696
parent7c7272ec5dc5d8822255083045bf70becc664e1c
parent1bff72d06c3a3306e92b7dbf994127aa0314ee34
Merge remote-tracking branch 'rcu/rcu/next'

Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/process_64.c
22 files changed:
arch/arm/kernel/process.c
arch/blackfin/kernel/process.c
arch/microblaze/kernel/process.c
arch/mips/kernel/process.c
arch/s390/kernel/process.c
arch/sh/kernel/idle.c
arch/um/kernel/process.c
arch/x86/kernel/apic/apic.c
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
include/linux/rcupdate.h
include/linux/sched.h
init/Kconfig
kernel/lockdep.c
kernel/pid.c
kernel/rcupdate.c
kernel/rcutorture.c
kernel/rcutree_trace.c
kernel/rtmutex.c
kernel/sched.c
kernel/time/tick-sched.c