From: Linus Torvalds Date: Fri, 23 Mar 2012 21:15:07 +0000 (-0700) Subject: Merge tag 'iommu-updates-v3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro... X-Git-Tag: MMI-PSA29.97-13-9~17194 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0b0c9d3a5872e8a02a071c6f0775ee6bf00a1206;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge tag 'iommu-updates-v3.4' of git://git./linux/kernel/git/joro/iommu Pull IOMMU updates from Joerg Roedel: "The IOMMU updates for this round are not very large patch-wise. But they contain two new IOMMU drivers for the ARM Tegra 2 and 3 platforms. Besides that there are also a few patches for the AMD IOMMU which prepare the driver for adding intr-remapping support and a couple of fixes." * tag 'iommu-updates-v3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: iommu/amd: Fix section mismatch iommu/amd: Move interrupt setup code into seperate function iommu/amd: Make sure IOMMU interrupts are re-enabled on resume iommu/amd: Fix section warning for prealloc_protection_domains iommu/amd: Don't initialize IOMMUv2 resources when not required iommu/amd: Update git-tree in MAINTAINERS iommu/tegra-gart: fix spin_unlock in map failure path iommu/amd: Fix double free of mem-region in error-path iommu/amd: Split amd_iommu_init function ARM: IOMMU: Tegra30: Add iommu_ops for SMMU driver ARM: IOMMU: Tegra20: Add iommu_ops for GART driver --- 0b0c9d3a5872e8a02a071c6f0775ee6bf00a1206