Merge tag 'v4.9-rc1' into x86/fpu, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Sun, 16 Oct 2016 11:04:34 +0000 (13:04 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 16 Oct 2016 11:04:34 +0000 (13:04 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/kernel/fpu/core.c
arch/x86/kernel/fpu/xstate.c
arch/x86/kernel/process_64.c
arch/x86/kernel/smpboot.c
arch/x86/kvm/cpuid.c
arch/x86/kvm/x86.c
include/linux/kvm_host.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge