Jeremy Fitzhardinge ca50a5f390 Merge branch 'upstream/pvhvm' into upstream/xen ... * upstream/pvhvm: Introduce CONFIG_XEN_PVHVM compile option blkfront: do not create a PV cdrom device if xen_hvm_guest support multiple .discard.* sections to avoid section type conflicts xen/pvhvm: fix build problem when !CONFIG_XEN xenfs: enable for HVM domains too x86: Call HVMOP_pagetable_dying on exit_mmap. x86: Unplug emulated disks and nics. x86: Use xen_vcpuop_clockevent, xen_clocksource and xen wallclock. xen: Fix find_unbound_irq in presence of ioapic irqs. xen: Add suspend/resume support for PV on HVM guests. xen: Xen PCI platform device driver. x86/xen: event channels delivery on HVM. x86: early PV on HVM features initialization. xen: Add support for HVM hypercalls. Conflicts: arch/x86/xen/enlighten.c arch/x86/xen/time.c		2010-08-04 14:49:16 -07:00
..
Makefile
xenbus_client.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
xenbus_comms.c	xenbus: rebind irq on restore	2008-05-27 10:11:38 +02:00
xenbus_comms.h
xenbus_probe.c	Merge branch 'upstream/pvhvm' into upstream/xen	2010-08-04 14:49:16 -07:00
xenbus_probe.h	xen: struct device - replace bus_id with dev_name(), dev_set_name()	2009-01-06 10:44:34 -08:00
xenbus_xs.c	xen: avoid allocation causing potential swap activity on the resume path	2010-06-03 09:34:45 +01:00