mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 01:22:07 +00:00
49b8c695e3
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
|
||
|---|---|---|
| .. | ||
| audit.c | ||
| ia32_aout.c | ||
| ia32_signal.c | ||
| ia32entry.S | ||
| ipc32.c | ||
| Makefile | ||
| nosyscall.c | ||
| sys_ia32.c | ||
| syscall_ia32.c | ||