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> |
||
|---|---|---|
| .. | ||
| asm | ||
| cpu-common/cpu | ||
| cpu-sh2/cpu | ||
| cpu-sh2a/cpu | ||
| cpu-sh3/cpu | ||
| cpu-sh4/cpu | ||
| cpu-sh4a/cpu | ||
| cpu-sh5/cpu | ||
| mach-common/mach | ||
| mach-dreamcast/mach | ||
| mach-ecovec24/mach | ||
| mach-kfr2r09/mach | ||
| mach-landisk/mach | ||
| mach-migor/mach | ||
| mach-sdk7786/mach | ||
| mach-se/mach | ||
| mach-sh03/mach | ||
| mach-x3proto/mach | ||