From: H. Peter Anvin <hpa@linux.intel.com>
Date: Sat, 22 Sep 2012 00:18:44 +0000 (-0700)
Subject: Merge branch 'x86/fpu' into x86/smap
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~68^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49b8c695e331c9685e6ffdbf34872509d77c8459;p=pandora-kernel.git

Merge branch 'x86/fpu' into x86/smap

Reason for merge:
       x86/fpu changed the structure of some of the code that x86/smap
       changes; mostly fpu-internal.h but also minor changes to the
       signal code.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

Resolved Conflicts:
	arch/x86/ia32/ia32_signal.c
	arch/x86/include/asm/fpu-internal.h
	arch/x86/kernel/signal.c
---

49b8c695e331c9685e6ffdbf34872509d77c8459
Reading git-diff-tree failed