Merge branch 'x86/cpu' into x86/mm, before applying dependent patch

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