Merge branch 'linus' into x86/asm
authorIngo Molnar <mingo@elte.hu>
Tue, 28 Feb 2012 09:26:07 +0000 (10:26 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 28 Feb 2012 09:27:36 +0000 (10:27 +0100)
Sync up the latest NMI fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/kernel/entry_64.S

Simple merge