e1df957670
Conflicts: fs/exec.c include/linux/init_task.h Simple context conflicts. |
||
---|---|---|
.. | ||
audit.c | ||
ia32_aout.c | ||
ia32_signal.c | ||
ia32entry.S | ||
ipc32.c | ||
Makefile | ||
sys_ia32.c |
e1df957670
Conflicts: fs/exec.c include/linux/init_task.h Simple context conflicts. |
||
---|---|---|
.. | ||
audit.c | ||
ia32_aout.c | ||
ia32_signal.c | ||
ia32entry.S | ||
ipc32.c | ||
Makefile | ||
sys_ia32.c |