tree d4afdfae0115b2ab56687d23d6329d6ad934788f
parent e59d1b0a24199db01978e6c1e89859eda93ce683
parent b1a74bf8212367be2b1d6685c11a84e056eaaaf1
author H. Peter Anvin <hpa@linux.intel.com> 1348273124 -0700
committer H. Peter Anvin <hpa@linux.intel.com> 1348273124 -0700

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