| commit | 3152657f104ce9b0f80793c92a745d5e97b43812 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Sat May 23 16:47:12 2015 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Mon May 25 09:39:19 2015 +0200 |
| tree | b720a75f328d16b999f02be8173e0db24ed699cb | |
| parent | b8c1b8ea7b219a7ba6d58d97bfdf1403b741f8d5 [diff] | |
| parent | ba155e2d21f6bf05de86a78dbe5bfd8757604a65 [diff] |
Merge branch 'linus' into x86/fpu
Resolve semantic conflict in arch/x86/kvm/cpuid.c with:
c447e76b4cab ("kvm/fpu: Enable eager restore kvm FPU for MPX")
By removing the FPU internal include files.
Signed-off-by: Ingo Molnar <mingo@kernel.org>