mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 15:41:36 +00:00
f541ae326f
Merge reason: we have gathered quite a few conflicts, need to merge upstream Conflicts: arch/powerpc/kernel/Makefile arch/x86/ia32/ia32entry.S arch/x86/include/asm/hardirq.h arch/x86/include/asm/unistd_32.h arch/x86/include/asm/unistd_64.h arch/x86/kernel/cpu/common.c arch/x86/kernel/irq.c arch/x86/kernel/syscall_table_32.S arch/x86/mm/iomap_32.c include/linux/sched.h kernel/Makefile Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
---|---|---|
.. | ||
audit.c | ||
ia32_aout.c | ||
ia32_signal.c | ||
ia32entry.S | ||
ipc32.c | ||
Makefile | ||
sys_ia32.c |