Joerg Roedel 1abb4ba596 Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next ...

Conflicts:
	drivers/iommu/amd_iommu.c
	drivers/iommu/iommu.c

2011-10-21 14:38:55 +02: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

x86, iommu: Mark DMAR IRQ as non-threaded

2011-09-13 23:44:53 +02:00

intel-iommu.c

iommu/vt-d: Use bus_set_iommu instead of register_iommu

2011-10-21 14:37:22 +02:00

intr_remapping.c

x86/ia64: intel-iommu: move to drivers/iommu/

2011-06-21 10:49:30 +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

iommu/omap: Fix build error with !IOMMU_SUPPORT

2011-09-14 16:06:04 +02:00

Makefile

omap: iommu/iovmm: move to dedicated iommu folder

2011-08-26 11:46:00 +02:00

msm_iommu_dev.c

msm: iommu: move to drivers/iommu/

2011-06-21 10:48:50 +02:00

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