Merge branch 'x86/cpufeature' into irq/numa