Merge branch 'x86/asm' into x86/apic, to resolve a conflict