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
..
amd_iommu_init.c	iommu/amd: Move missing parts to drivers/iommu	2011-06-21 10:49:31 +02:00
amd_iommu_proto.h	iommu/amd: Move missing parts to drivers/iommu	2011-06-21 10:49:31 +02:00
amd_iommu_types.h	Merge branches 'amd/transparent-bridge' and 'core'	2011-06-21 11:14:10 +02:00
amd_iommu.c	Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next	2011-10-21 14:38:55 +02:00
dmar.c	Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 16:17:32 +02:00
intel-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
intr_remapping.c	Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 16:17:32 +02:00
intr_remapping.h	x86/ia64: intel-iommu: move to drivers/iommu/	2011-06-21 10:49:30 +02:00
iommu.c	Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next	2011-10-21 14:38:55 +02:00
iova.c	x86/ia64: intel-iommu: move to drivers/iommu/	2011-06-21 10:49:30 +02:00
Kconfig	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu	2011-10-30 15:46:19 -07:00
Makefile	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu	2011-10-30 15:46:19 -07:00
msm_iommu_dev.c
msm_iommu.c	iommu/msm: Use bus_set_iommu instead of register_iommu	2011-10-21 14:37:23 +02:00
omap-iommu-debug.c	omap: iommu: omapify 'struct iommu' and exposed API	2011-08-26 11:46:01 +02:00
omap-iommu.c	Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next	2011-10-21 14:38:55 +02:00
omap-iovmm.c	iommu/omap: ->unmap() should return order of unmapped page	2011-09-05 15:14:37 +02:00