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> |
||
|---|---|---|
| .. | ||
| eeprom.c | ||
| eeprom.h | ||
| fwio.c | ||
| Kconfig | ||
| led.c | ||
| lmac.h | ||
| main.c | ||
| Makefile | ||
| net2280.h | ||
| p54.h | ||
| p54pci.c | ||
| p54pci.h | ||
| p54spi_eeprom.h | ||
| p54spi.c | ||
| p54spi.h | ||
| p54usb.c | ||
| p54usb.h | ||
| txrx.c | ||