Merge branch 'x86/nmi' into x86/devel