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)
commit458ce2910aa83d8a2cafb489d727f7da839e73c6
tree28e088137eb068e5620f17eaf0ca19d1562006ed
parent69466466ce889cd2cbc8cda9ff1c6083f48cc7f9
parent586c6e7013c8cbb8c91aaa6568ec349b1dc2c691
Merge branch 'linus' into x86/asm

Sync up the latest NMI fixes.

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