Merge branch 'x86/asm' into x86/urgent, to pick up fix

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