Merge commit 'v2.6.31-rc7' into x86/cleanups
authorIngo Molnar <mingo@elte.hu>
Mon, 24 Aug 2009 10:25:44 +0000 (12:25 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 24 Aug 2009 10:25:54 +0000 (12:25 +0200)
commit5f9ece02401116b29eb04396b99ea092acb75dd8
treee10386e2dc63c275646b4eb0bed857da7bf86c6a
parent9f51e24ee8b5a1595b6a5ac0c2be278a16488e75
parent422bef879e84104fee6dc68ded0e371dbeb5f88e
Merge commit 'v2.6.31-rc7' into x86/cleanups

Merge reason: we were on -rc1 before - go up to -rc7

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/apic/ipi.c
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/perfctr-watchdog.c
arch/x86/kvm/x86.c