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
..
xenbus	Merge branch 'upstream/pvhvm' into upstream/xen	2010-08-04 14:49:16 -07:00
xenfs	xenfs: enable for HVM domains too	2010-07-26 23:13:27 -07:00
balloon.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
cpu_hotplug.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-11 12:18:16 -08:00
events.c	Introduce CONFIG_XEN_PVHVM compile option	2010-07-29 11:11:33 -07:00
evtchn.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
features.c	xen: clean up asm/xen/hypervisor.h	2008-12-16 21:50:31 +01:00
grant-table.c	xen: Xen PCI platform device driver.	2010-07-22 16:46:09 -07:00
Kconfig	Introduce CONFIG_XEN_PVHVM compile option	2010-07-29 11:11:33 -07:00
Makefile	xen: Xen PCI platform device driver.	2010-07-22 16:46:09 -07:00
manage.c	xen: Add suspend/resume support for PV on HVM guests.	2010-07-22 16:46:21 -07:00
platform-pci.c	x86: Unplug emulated disks and nics.	2010-07-26 23:13:25 -07:00
sys-hypervisor.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
xencomm.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