linux-stable/arch/x86/ia32
H. Peter Anvin 49b8c695e3 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
2012-09-21 17:18:44 -07:00
..
audit.c x86: coding style fixes in arch/x86/ia32/audit.c 2008-01-30 13:32:54 +01:00
ia32_aout.c x86: fix broken TASK_SIZE for ia32_aout 2012-05-06 10:15:18 -07:00
ia32_signal.c Merge branch 'x86/fpu' into x86/smap 2012-09-21 17:18:44 -07:00
ia32entry.S x86, smap: Add STAC and CLAC instructions to control user space access 2012-09-21 12:45:27 -07:00
ipc32.c x86: introducing asm/sys_ia32.h 2008-12-29 13:18:40 +01:00
Makefile x86: Generate system call tables and unistd_*.h from tables 2011-11-17 13:35:37 -08:00
nosyscall.c x86-64, ia32: Move compat_ni_syscall into C and its own file 2011-11-17 13:35:35 -08:00
sys_ia32.c x86: Fix __user annotations in asm/sys_ia32.h 2012-09-05 10:52:23 +02:00
syscall_ia32.c x86, syscall: Re-fix typo in comment 2011-11-18 16:25:07 -08:00