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

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2016-08-01 09:30:06 +02:00
commit 7946c2beac