Linus Torvalds 0cfdc72439 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu ... * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (33 commits) iommu/core: Remove global iommu_ops and register_iommu iommu/msm: Use bus_set_iommu instead of register_iommu iommu/omap: Use bus_set_iommu instead of register_iommu iommu/vt-d: Use bus_set_iommu instead of register_iommu iommu/amd: Use bus_set_iommu instead of register_iommu iommu/core: Use bus->iommu_ops in the iommu-api iommu/core: Convert iommu_found to iommu_present iommu/core: Add bus_type parameter to iommu_domain_alloc Driver core: Add iommu_ops to bus_type iommu/core: Define iommu_ops and register_iommu only with CONFIG_IOMMU_API iommu/amd: Fix wrong shift direction iommu/omap: always provide iommu debug code iommu/core: let drivers know if an iommu fault handler isn't installed iommu/core: export iommu_set_fault_handler() iommu/omap: Fix build error with !IOMMU_SUPPORT iommu/omap: Migrate to the generic fault report mechanism iommu/core: Add fault reporting mechanism iommu/core: Use PAGE_SIZE instead of hard-coded value iommu/core: use the existing IS_ALIGNED macro iommu/msm: ->unmap() should return order of unmapped page ... Fixup trivial conflicts in drivers/iommu/Makefile: "move omap iommu to dedicated iommu folder" vs "Rename the DMAR and INTR_REMAP config options" just happened to touch lines next to each other.		2011-10-30 15:46:19 -07:00
..
assigned-dev.c	Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm	2011-10-30 15:36:45 -07: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	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu	2011-10-30 15:46:19 -07: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