diff options
| author | Joerg Roedel <jroedel@suse.de> | 2015-04-02 13:33:19 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-04-02 13:33:19 +0200 |
| commit | 7f65ef01e131650d455875598099cd06fea6096b (patch) | |
| tree | 4f1d954664a7d05dd6cfbf1e4af6250bf1dc8f48 /drivers/iommu/tegra-smmu.c | |
| parent | iommu/vt-d: Remove unused variable (diff) | |
| parent | iommu/vt-d: Convert non-returned local variable to boolean when relevant (diff) | |
| parent | iommu/amd: Correctly encode huge pages in iommu page tables (diff) | |
| parent | Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/lin... (diff) | |
| parent | iommu/tegra: smmu: Compute PFN mask at runtime (diff) | |
| parent | iommu: Remove domain_init and domain_free iommu_ops (diff) | |
| download | linux-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