Merge branch 'x86/cpufeature'