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
..
emulate.c	KVM: x86 emulator: convert push %sreg/pop %sreg to direct decode	2011-09-25 19:52:58 +03:00
i8254.c	KVM: Intelligent device lookup on I/O bus	2011-09-25 19:17:59 +03:00
i8254.h
i8259.c	KVM: Clean up and extend rate-limited output	2011-09-25 19:52:43 +03:00
irq.c
irq.h	KVM: Intelligent device lookup on I/O bus	2011-09-25 19:17:59 +03:00
Kconfig
kvm_cache_regs.h	KVM: MMU: Do not unconditionally read PDPTE from guest memory	2011-09-25 19:18:01 +03:00
kvm_timer.h	KVM: emulate lapic tsc deadline timer for guest	2011-10-05 15:34:56 +02:00
lapic.c	KVM: emulate lapic tsc deadline timer for guest	2011-10-05 15:34:56 +02:00
lapic.h	KVM: emulate lapic tsc deadline timer for guest	2011-10-05 15:34:56 +02:00
Makefile
mmu_audit.c	KVM: Clean up and extend rate-limited output	2011-09-25 19:52:43 +03:00
mmu.c	KVM: MMU: Do not unconditionally read PDPTE from guest memory	2011-09-25 19:18:01 +03:00
mmu.h
mmutrace.h
paging_tmpl.h	KVM: MMU: Fix SMEP failure during fetch	2011-09-25 19:18:02 +03:00
svm.c	KVM: SVM: Keep intercepting task switching with NPT enabled	2011-10-30 12:24:10 +02:00
timer.c
trace.h	KVM: Use __print_symbolic() for vmexit tracepoints	2011-09-25 19:17:59 +03:00
tss.h
vmx.c	KVM: Clean up and extend rate-limited output	2011-09-25 19:52:43 +03:00
x86.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu	2011-10-30 15:46:19 -07:00
x86.h