tree 28e088137eb068e5620f17eaf0ca19d1562006ed
parent 69466466ce889cd2cbc8cda9ff1c6083f48cc7f9
parent 586c6e7013c8cbb8c91aaa6568ec349b1dc2c691
author Ingo Molnar <mingo@elte.hu> 1330421167 +0100
committer Ingo Molnar <mingo@elte.hu> 1330421256 +0100

Merge branch 'linus' into x86/asm

Sync up the latest NMI fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>