Conflicts:
	arch/x86/kernel/apic/hw_nmi.c

Merge reason: Resolve conflict, queue up dependent patch.
Signed-off-by: NIngo Molnar <mingo@elte.hu>