]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit626b0183582e3a77805e5076cec07bff7c9ad641
treea22d84d037543f74b6c86969c7e87ab799768de9
parent490b751ccd57e83bc00a119f65c0906cad03ead4
parent75811e536f67659c757408d96632dd55a25cda34
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