summaryrefslogtreecommitdiffstats
path: root/drivers/iommu/tegra-gart.c
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2015-04-02 13:33:19 +0200
committerJoerg Roedel <jroedel@suse.de>2015-04-02 13:33:19 +0200
commit7f65ef01e131650d455875598099cd06fea6096b (patch)
tree4f1d954664a7d05dd6cfbf1e4af6250bf1dc8f48 /drivers/iommu/tegra-gart.c
parentiommu/vt-d: Remove unused variable (diff)
parentiommu/vt-d: Convert non-returned local variable to boolean when relevant (diff)
parentiommu/amd: Correctly encode huge pages in iommu page tables (diff)
parentMerge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/lin... (diff)
parentiommu/tegra: smmu: Compute PFN mask at runtime (diff)
parentiommu: Remove domain_init and domain_free iommu_ops (diff)
downloadlinux-7f65ef01e131650d455875598099cd06fea6096b.tar.xz
linux-7f65ef01e131650d455875598099cd06fea6096b.zip
Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/tegra' and 'core' into next
Conflicts: drivers/iommu/amd_iommu.c drivers/iommu/tegra-gart.c drivers/iommu/tegra-smmu.c