Merge branch 'x86/asm' into x86/apic, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Sun, 17 May 2015 05:58:08 +0000 (07:58 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 17 May 2015 05:58:08 +0000 (07:58 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge