Merge branch 'x86/asm' into x86/atomic