ff4b8a57f0
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file, and it fixes the build error in the arch/x86/kernel/microcode_core.c file, that the merge did not catch. The microcode_core.c patch was provided by Stephen Rothwell <sfr@canb.auug.org.au> who was invaluable in the merge issues involved with the large sysdev removal process in the driver-core tree. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
|---|---|---|
| .. | ||
| vdso32 | ||
| vdso64 | ||
| asm-offsets.c | ||
| audit.c | ||
| audit.h | ||
| base.S | ||
| bitmap.c | ||
| compat_audit.c | ||
| compat_exec_domain.c | ||
| compat_linux.c | ||
| compat_linux.h | ||
| compat_ptrace.h | ||
| compat_signal.c | ||
| compat_wrapper.S | ||
| cpcmd.c | ||
| crash_dump.c | ||
| crash.c | ||
| debug.c | ||
| diag.c | ||
| dis.c | ||
| early.c | ||
| ebcdic.c | ||
| entry64.S | ||
| entry.h | ||
| entry.S | ||
| ftrace.c | ||
| head31.S | ||
| head64.S | ||
| head_kdump.S | ||
| head.S | ||
| init_task.c | ||
| ipl.c | ||
| irq.c | ||
| jump_label.c | ||
| kprobes.c | ||
| machine_kexec.c | ||
| Makefile | ||
| mcount64.S | ||
| mcount.S | ||
| mem_detect.c | ||
| module.c | ||
| nmi.c | ||
| process.c | ||
| processor.c | ||
| ptrace.c | ||
| reipl64.S | ||
| reipl.S | ||
| relocate_kernel64.S | ||
| relocate_kernel.S | ||
| s390_ksyms.c | ||
| sclp.S | ||
| setup.c | ||
| signal.c | ||
| smp.c | ||
| stacktrace.c | ||
| suspend.c | ||
| switch_cpu64.S | ||
| switch_cpu.S | ||
| swsusp_asm64.S | ||
| sys_s390.c | ||
| syscalls.S | ||
| sysinfo.c | ||
| time.c | ||
| topology.c | ||
| traps.c | ||
| vdso.c | ||
| vmlinux.lds.S | ||
| vtime.c | ||