Merge branch 'x86/asm' into x86/core, to prepare for new patch