Merge branch 'x86/cpu'