Joerg Roedel 09b5269a1b Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next ...

Conflicts:
	drivers/iommu/arm-smmu.c

2014-10-02 12:24:45 +02:00

..

amd_iommu_init.c

iommu/amd: Fix devid mapping for ivrs_ioapic override

2014-09-25 19:24:52 +02:00

amd_iommu_proto.h

…

amd_iommu_types.h

iommu/amd: Move struct iommu_dev_data to amd_iommu.c

2014-08-26 11:37:37 +02:00

amd_iommu_v2.c

iommu/amd: Fix 2 typos in comments

2014-07-30 16:07:50 +02:00

amd_iommu.c

Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next

2014-10-02 12:24:45 +02:00

arm-smmu.c

Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next

2014-10-02 12:24:45 +02:00

dmar.c

Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next

2014-10-02 12:24:45 +02:00

exynos-iommu.c

iommu/exynos: Fix trivial typos

2014-08-19 13:07:43 +02:00

fsl_pamu_domain.c

iommu/fsl: Convert to iommu_capable() API function

2014-09-25 15:47:37 +02:00

fsl_pamu_domain.h

…

fsl_pamu.c

Merge branches 'x86/vt-d', 'x86/amd', 'arm/omap', 'ppc/pamu', 'arm/smmu', 'arm/exynos' and 'core' into next

2014-07-31 20:29:02 +02:00

fsl_pamu.h

…

intel_irq_remapping.c

Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next

2014-10-02 12:24:45 +02:00

intel-iommu.c

Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next

2014-10-02 12:24:45 +02:00

iommu-sysfs.c

iommu: Fix compile error in iommu-sysfs.c

2014-07-07 12:01:21 +02:00

iommu-traces.c

…

iommu.c

iommu: Fix bus notifier breakage

2014-09-25 16:46:37 +02:00

iova.c

…

ipmmu-vmsa.c

iommu: Constify struct iommu_ops

2014-07-07 10:36:59 +02:00

irq_remapping.c

iommu/irq_remapping: Fix the regression of hpet irq remapping

2014-09-25 19:11:47 +02:00

irq_remapping.h

iommu/irq_remapping: Fix the regression of hpet irq remapping

2014-09-25 19:11:47 +02:00

Kconfig

Merge branches 'x86/vt-d', 'x86/amd', 'arm/omap', 'ppc/pamu', 'arm/smmu', 'arm/exynos' and 'core' into next

2014-07-31 20:29:02 +02:00

Makefile

Merge branches 'x86/vt-d', 'x86/amd', 'arm/omap', 'ppc/pamu', 'arm/smmu', 'arm/exynos' and 'core' into next

2014-07-31 20:29:02 +02:00

msm_iommu_dev.c

iommu/msm: Use devm_ioremap_resource to simplify code

2014-05-30 20:20:12 +02:00

msm_iommu_hw-8xxx.h

…

msm_iommu.c

iommu/msm: Convert to iommu_capable() API function

2014-09-25 15:47:38 +02:00

msm_iommu.h

…

of_iommu.c

…

omap-iommu2.c

…

omap-iommu-debug.c

iommu/omap: Remove virtual memory manager

2014-07-29 12:38:07 +02:00

omap-iommu.c

Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next

2014-10-02 12:24:45 +02:00

omap-iommu.h

iommu/omap: Remove omap_iommu unused owner field

2014-09-25 15:56:37 +02:00

omap-iopgtable.h

…

shmobile-iommu.c

iommu: Constify struct iommu_ops

2014-07-07 10:36:59 +02:00

shmobile-ipmmu.c

…

shmobile-ipmmu.h

…

tegra-gart.c

iommu: Make of_device_id array const

2014-09-25 16:01:03 +02:00

tegra-smmu.c

iommu: Make of_device_id array const

2014-09-25 16:01:03 +02:00