Merge branch 'linus' into perfcounters/core
Ingo Molnar [Tue, 7 Apr 2009 10:05:21 +0000 (12:05 +0200)]
Merge reason: need the upstream facility added by:

  7f1e2ca: hrtimer: fix rq->lock inversion (again)

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
arch/x86/Kconfig
arch/x86/kernel/apic/apic.c
init/Kconfig
kernel/exit.c
kernel/sched.c

Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/exit.c
Simple merge
diff --cc kernel/sched.c
Simple merge