Merge branch 'x86/urgent' into x86/platform, to queue up dependent patch

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