Merge branch 'x86/cpufeature' into x86/asm, to pick up dependency

Signed-off-by: Ingo Molnar <mingo@kernel.org>