From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 23 May 2015 14:47:12 +0000 (+0200)
Subject: Merge branch 'linus' into x86/fpu
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~174^2~38
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3152657f104ce9b0f80793c92a745d5e97b43812;p=pandora-kernel.git

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>
---

3152657f104ce9b0f80793c92a745d5e97b43812
Reading git-diff-tree failed