git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8c1b8e ba155e2)
Merge branch 'linus' into x86/fpu
authorIngo Molnar <mingo@kernel.org>
Sat, 23 May 2015 14:47:12 +0000 (16:47 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 25 May 2015 07:39:19 +0000 (09:39 +0200)
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>

Trivial merge
Pandora Kernel Repository