Merge branch 'linus' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 10:05:21 +0000 (12:05 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 10:05:25 +0000 (12:05 +0200)
commit6c009ecef8cca28c7c09eb16d0802e37915a76e1
tree11c773f780186fdb9fbc9c80a73fb7c8426b1fba
parent98c2aaf8be5baf7193be37fb28bce8e7327158bc
parentd508afb437daee7cf07da085b635c44a4ebf9b38
Merge branch 'linus' into perfcounters/core

Merge reason: need the upstream facility added by:

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

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/Kconfig
arch/x86/kernel/apic/apic.c
init/Kconfig
kernel/exit.c
kernel/sched.c