Merge branch 'x86/asm' into x86/urgent, to pick up fix
authorIngo Molnar <mingo@kernel.org>
Mon, 1 Aug 2016 07:30:06 +0000 (09:30 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 1 Aug 2016 07:30:19 +0000 (09:30 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge