From: Ingo Molnar Date: Tue, 28 Feb 2012 09:26:07 +0000 (+0100) Subject: Merge branch 'linus' into x86/asm X-Git-Tag: firefly_0821_release~3680^2~3318^2~5 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=458ce2910aa83d8a2cafb489d727f7da839e73c6;p=firefly-linux-kernel-4.4.55.git Merge branch 'linus' into x86/asm Sync up the latest NMI fixes. Signed-off-by: Ingo Molnar --- 458ce2910aa83d8a2cafb489d727f7da839e73c6