Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 ... 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>		2012-01-06 11:42:52 -08:00
..
interface	Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel"	2011-12-19 09:30:35 -05:00
balloon.h	xen-balloon: convert sysdev_class to a regular subsystem	2011-12-14 15:32:50 -08:00
events.h	xen/pci: Remove 'xen_allocate_pirq_gsi'.	2011-07-11 13:19:33 -04:00
evtchn.h	xen: add /dev/xen/evtchn driver	2009-03-30 09:26:49 -07:00
features.h	xen: Core Xen implementation	2007-07-18 08:47:42 -07:00
gntalloc.h	xen/gntalloc,gntdev: Add unmap notify ioctl	2011-02-14 14:16:17 -05:00
gntdev.h	xen/gntalloc,gntdev: Add unmap notify ioctl	2011-02-14 14:16:17 -05:00
grant_table.h	Merge branch 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-11-06 18:31:36 -08:00
hvc-console.h	treewide: use __printf not __attribute__((format(printf,...)))	2011-10-31 17:30:54 -07:00
hvm.h	x86/xen: event channels delivery on HVM.	2010-07-22 16:45:59 -07:00
Kbuild	xen: add privcmd driver	2010-10-20 16:22:29 -07:00
page.h	xen: allow balloon driver to use more than one memory region	2011-09-29 11:12:10 -04:00
platform_pci.h	xen: Remove hanging references to CONFIG_XEN_PLATFORM_PCI	2011-11-16 12:13:42 -05:00
privcmd.h	xen: fix header export to userspace	2010-11-16 10:57:05 -08:00
swiotlb-xen.h	swiotlb-xen: SWIOTLB library for Xen PV guest with PCI passthrough.	2010-07-27 11:51:00 -04:00
tmem.h	xen: tmem: self-ballooning and frontswap-selfshrinking	2011-07-08 12:26:21 -06:00
xen-ops.h	xen: suspend: add "arch" to pre/post suspend hooks	2011-02-25 16:43:12 +00:00
xen.h	xen: move Xen-testing predicates to common header	2009-11-04 08:47:24 -08:00
xenbus.h	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
xencomm.h	xen: import arch generic part of xencomm	2008-04-24 23:57:32 +02:00