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