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)
commit9dda1658a9bd450d65da5153a2427955785d17c2
treec563b728d879c2b446a8f1c33ce351ffb1f1d34e
parentb72e7464e4cf80117938e6adb8c22fdc1ca46d42
parenta49976d14f780942dafafbbf16f891c27d385ea0
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 <mingo@kernel.org>
MAINTAINERS
arch/x86/entry/entry_64.S
arch/x86/include/asm/msr.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/traps.c