Joerg Roedel 00fb5430f5 Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next ... Conflicts: drivers/pci/hotplug/acpiphp_glue.c		2012-01-09 13:04:05 +01:00
..
assigned-dev.c	KVM: Device assignment permission checks	2011-12-25 19:03:54 +02:00
async_pf.c	KVM: fix the race while wakeup all pv guest	2011-01-12 11:29:03 +02:00
async_pf.h	KVM: Halt vcpu if page it tries to access is swapped out	2011-01-12 11:21:39 +02:00
coalesced_mmio.c	KVM: Intelligent device lookup on I/O bus	2011-09-25 19:17:59 +03:00
coalesced_mmio.h	KVM: Make coalesced mmio use a device per zone	2011-09-25 19:17:57 +03:00
eventfd.c	KVM: Intelligent device lookup on I/O bus	2011-09-25 19:17:59 +03:00
ioapic.c	KVM: Intelligent device lookup on I/O bus	2011-09-25 19:17:59 +03:00
ioapic.h	KVM: convert ioapic lock to spinlock	2010-05-13 01:23:55 -03:00
iodev.h	KVM: remove in_range from io devices	2009-09-10 08:33:05 +03:00
iommu.c	iommu/core: split mapping to page sizes as supported by the hardware	2011-11-10 11:40:37 +01:00
irq_comm.c	KVM: fast-path msi injection with irqfd	2011-01-12 11:29:38 +02:00
Kconfig	KVM: Halt vcpu if page it tries to access is swapped out	2011-01-12 11:21:39 +02:00
kvm_main.c	KVM: Intelligent device lookup on I/O bus	2011-09-25 19:17:59 +03:00