Joerg Roedel 76771c938e Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next ...

Conflicts:
	drivers/iommu/arm-smmu.c

2014-12-02 13:07:13 +01: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

perf/x86/amd: Add IOMMU Performance Counter resource management

2013-06-19 13:04:52 +02:00

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 accounting of device_state

2014-11-12 14:58:33 +01:00

amd_iommu.c

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

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

arm-smmu.c

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

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

dmar.c

iommu/vt-d: Search for ACPI _DSM method for DMAR hotplug

2014-11-18 11:18:36 +01:00

exynos-iommu.c

iommu: Add iommu_map_sg() function

2014-11-04 14:53:36 +01: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

iommu/fsl: Freescale PAMU driver and iommu implementation.

2013-08-14 11:38:34 +02:00

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

iommu/fsl: Freescale PAMU driver and iommu implementation.

2013-08-14 11:38:34 +02:00

intel_irq_remapping.c

iommu/vt-d: Enhance error recovery in function intel_enable_irq_remapping()

2014-11-18 11:18:36 +01:00

intel-iommu.c

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

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

iommu-sysfs.c

iommu: Fix compile error in iommu-sysfs.c

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

iommu-traces.c

iommu: Add iommu_error class event to iommu trace

2013-09-25 11:07:04 +02:00

iommu.c

iommu: Decouple iommu_map_sg from CPU page size

2014-12-02 13:05:04 +01:00

iova.c

iommu/vt-d: Update IOMMU state when memory hotplug happens

2014-03-04 17:51:06 +01:00

ipmmu-vmsa.c

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

2014-12-02 13:07:13 +01: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 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next

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

Makefile

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

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

msm_iommu_dev.c

iommu/msm: Use dev_get_platdata()

2014-11-04 15:03:39 +01:00

msm_iommu_hw-8xxx.h

iommu/msm: Move mach includes to iommu directory

2013-08-06 11:18:03 -07:00

msm_iommu.c

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

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

msm_iommu.h

iommu/msm: Move mach includes to iommu directory

2013-08-06 11:18:03 -07:00

of_iommu.c

iommu: add missing include

2014-01-07 15:16:27 +01:00

omap-iommu-debug.c

iommu/omap: Switch pagetable debugfs entry to use seq_file

2014-10-23 14:33:48 +02:00

omap-iommu.c

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

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

omap-iommu.h

iommu/omap: Do not export unneeded functions

2014-10-23 14:33:47 +02:00

omap-iopgtable.h

iommu/omap: Move to_iommu definition from omap-iopgtable.h

2014-04-16 16:30:15 +02:00

rockchip-iommu.c

iommu/rockchip: rk3288 iommu driver

2014-11-03 17:29:09 +01:00

shmobile-iommu.c

iommu: Add iommu_map_sg() function

2014-11-04 14:53:36 +01:00

shmobile-ipmmu.c

iommu/shmobile: Use devm_ioremap_resource()

2014-04-17 12:16:12 +02:00

shmobile-ipmmu.h

iommu/shmobile: Turn the flush_lock mutex into a spinlock

2014-01-07 15:35:25 +01:00

tegra-gart.c

iommu: Make of_device_id array const

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

tegra-smmu.c

iommu: Add iommu_map_sg() function

2014-11-04 14:53:36 +01:00