Files
linux/include/asm-generic
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
..
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:31 +02:00
2009-06-11 21:02:51 +02:00
2008-05-01 08:03:58 -07:00
2009-06-11 21:02:42 +02:00
2005-04-16 15:20:36 -07:00
2009-06-03 14:06:14 -04:00
2009-12-17 11:03:24 -05:00
2010-05-27 09:12:42 -07:00
2005-04-16 15:20:36 -07:00
2008-08-12 16:07:31 -07:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:16 +02:00
2009-09-10 10:46:47 +03:00
2010-01-05 15:34:49 +09:00
2009-06-11 21:02:15 +02:00
2009-09-09 13:29:18 -07:00
2007-05-11 08:29:34 -07:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:15 +02:00
2009-03-26 18:14:21 +01:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:42 +02:00
2005-04-16 15:20:36 -07:00