Merge branch 'x86/asm' into x86/core, to prepare for new patch
authorIngo Molnar <mingo@kernel.org>
Mon, 8 Jun 2015 18:48:01 +0000 (20:48 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 8 Jun 2015 18:48:20 +0000 (20:48 +0200)
Collect all changes to arch/x86/entry/entry_64.S, before applying
patch that changes most of the file.

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

Trivial merge