Merge branch 'linus' into x86/fpu, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Wed, 23 Nov 2016 06:18:09 +0000 (07:18 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 23 Nov 2016 06:18:09 +0000 (07:18 +0100)
commit064e6a8ba61a751625478f656c6f76a6f37a009e
treea22d84d037543f74b6c86969c7e87ab799768de9
parentaf25ed59b5616b389d90877f7085dc5d457a3d49
parent23400ac997062647f2b63c82030d189671b1effe
Merge branch 'linus' into x86/fpu, to resolve conflicts

 Conflicts:
arch/x86/kernel/fpu/core.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/fpu/core.c
arch/x86/kvm/vmx.c
arch/x86/kvm/x86.c