Conflicts: arch/sparc/kernel/time_64.c drivers/gpu/drm/drm_proc.c Manual merge to resolve build warning due to phys_addr_t type change on x86: drivers/gpu/drm/drm_info.c Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
|---|---|---|
| .. | ||
| audit.c | ||
| ia32_aout.c | ||
| ia32_signal.c | ||
| ia32entry.S | ||
| ipc32.c | ||
| Makefile | ||
| sys_ia32.c | ||