Merge branch 'x86/cpu' into x86/asm, to avoid conflict