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> |
||
|---|---|---|
| .. | ||
| irq | ||
| sh2 | ||
| sh2a | ||
| sh3 | ||
| sh4 | ||
| sh4a | ||
| sh5 | ||
| shmobile | ||
| adc.c | ||
| clock-cpg.c | ||
| clock.c | ||
| fpu.c | ||
| hwblk.c | ||
| init.c | ||
| Makefile | ||
| proc.c | ||