Merge branch 'x86/urgent' into x86/asm, before applying dependent patches
authorIngo Molnar <mingo@kernel.org>
Fri, 31 Jul 2015 08:23:35 +0000 (10:23 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 31 Jul 2015 08:23:35 +0000 (10:23 +0200)
commit5b929bd11df23922daf1be5d52731cc3900c1d79
tree105fa5987b03c9f4e0260a9eb04dff7bb3d16839
parentb2c51106c7581866c37ffc77c5d739f3d4b7cbc9
parent37868fe113ff2ba814b3b4eb12df214df555f8dc
Merge branch 'x86/urgent' into x86/asm, before applying dependent patches

Signed-off-by: Ingo Molnar <mingo@kernel.org>
15 files changed:
arch/x86/Kconfig
arch/x86/entry/entry_64.S
arch/x86/entry/entry_64_compat.S
arch/x86/include/asm/processor.h
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/espfix_64.c
arch/x86/kernel/irq.c
arch/x86/kernel/nmi.c
arch/x86/kernel/process_64.c
arch/x86/kernel/tsc.c
arch/x86/kvm/lapic.c
arch/x86/kvm/svm.c
arch/x86/kvm/vmx.c
arch/x86/kvm/x86.c
arch/x86/xen/enlighten.c