Merge branch 'x86/platform' into x86/headers, to apply dependent patches

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