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> |
||
---|---|---|
.. | ||
xen-pciback | ||
xenbus | ||
xenfs | ||
Kconfig | ||
Makefile | ||
balloon.c | ||
biomerge.c | ||
cpu_hotplug.c | ||
events.c | ||
evtchn.c | ||
features.c | ||
gntalloc.c | ||
gntdev.c | ||
grant-table.c | ||
manage.c | ||
pci.c | ||
platform-pci.c | ||
swiotlb-xen.c | ||
sys-hypervisor.c | ||
tmem.c | ||
xen-balloon.c | ||
xen-selfballoon.c | ||
xencomm.c |