From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 20 May 2015 09:59:45 +0000 (+0200)
Subject: Merge branch 'x86/urgent' into x86/fpu, to resolve a conflict
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~174^2~41
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f56a8d024757e2f3bda8bf3bdf6aa1a21e6810b;p=pandora-kernel.git

Merge branch 'x86/urgent' into x86/fpu, to resolve a conflict

Conflicts:
	arch/x86/kernel/i387.c

This commit is conflicting:

  e88221c50cad ("x86/fpu: Disable XSAVES* support for now")

These functions changed a lot, move the quirk to arch/x86/kernel/fpu/init.c's
fpu__init_system_xstate_size_legacy().

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

6f56a8d024757e2f3bda8bf3bdf6aa1a21e6810b
Reading git-diff-tree failed