Merge branch 'x86/cpu' from tip