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> |
||
|---|---|---|
| .. | ||
| interface | ||
| balloon.h | ||
| events.h | ||
| evtchn.h | ||
| features.h | ||
| gntalloc.h | ||
| gntdev.h | ||
| grant_table.h | ||
| hvc-console.h | ||
| hvm.h | ||
| Kbuild | ||
| page.h | ||
| platform_pci.h | ||
| privcmd.h | ||
| swiotlb-xen.h | ||
| tmem.h | ||
| xen-ops.h | ||
| xen.h | ||
| xenbus.h | ||
| xencomm.h | ||