From: Ingo Molnar Date: Mon, 8 Jun 2015 18:48:01 +0000 (+0200) Subject: Merge branch 'x86/asm' into x86/core, to prepare for new patch X-Git-Tag: kvm-4.2-2~148^2^2~8 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9dda1658a9bd450d65da5153a2427955785d17c2;p=users%2Fdwmw2%2Flinux.git Merge branch 'x86/asm' into x86/core, to prepare for new patch Collect all changes to arch/x86/entry/entry_64.S, before applying patch that changes most of the file. Signed-off-by: Ingo Molnar --- 9dda1658a9bd450d65da5153a2427955785d17c2