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
..
acpi	ACPI: skip checking BM_STS if the BIOS doesn't ask for it	2010-07-22 16:54:27 -04:00
asm-generic	Merge branch 'upstream/pvhvm' into upstream/xen	2010-08-04 14:49:16 -07:00
crypto	crypto: skcipher - Add ablkcipher_walk interfaces	2010-05-19 14:13:07 +10:00
drm	drm/ttm: Allocate the page pool manager in the heap.	2010-07-07 12:14:11 +10:00
keys
linux	Merge branch 'upstream/pvhvm' into upstream/xen	2010-08-04 14:49:16 -07:00
math-emu	math-emu: correct test for downshifting fraction in _FP_FROM_INT()	2010-07-20 18:45:14 -07:00
media	V4L/DVB: tuner: Add a definition for the Philips FQ1236 MK5 NTSC tuner	2010-07-08 16:49:53 -03:00
mtd
net	net sched: fix race in mirred device removal	2010-07-24 21:04:20 -07:00
pcmcia	pcmcia: remove unused mem_op.h	2010-05-10 10:23:20 +02:00
rdma	IB/core: Allow device-specific per-port sysfs files	2010-05-21 10:34:44 -07:00
rxrpc
scsi	SCSI: implement sd_unlock_native_capacity()	2010-06-02 13:50:04 -04:00
sound	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-05-20 09:41:44 -07:00
trace	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-06-10 09:30:09 -07:00
video	fbdev: move FBIO_WAITFORVSYNC to linux/fb.h	2010-05-25 08:07:09 -07:00
xen	x86: Call HVMOP_pagetable_dying on exit_mmap.	2010-07-26 23:13:26 -07:00
Kbuild