diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2012-07-23 12:17:00 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-07-23 12:17:00 +0200 |
| commit | 395e51f18d3b26619c1c462b7a1c0226846ac0a9 (patch) | |
| tree | fd0fcf5d1714ba8f634689964dd70add4eab354d /include | |
| parent | Linux 3.5 (diff) | |
| parent | iommu/amd: Fix hotplug with iommu=pt (diff) | |
| parent | iommu/amd: Convert iommu initialization to state machine (diff) | |
| parent | iommu: Remove group_mf (diff) | |
| parent | Merge tag 'v3.5-rc7' into arm/tegra (diff) | |
| parent | iommu/exynos: Implement DOMAIN_ATTR_GEOMETRY attribute (diff) | |
| download | linux-395e51f18d3b26619c1c462b7a1c0226846ac0a9.tar.xz linux-395e51f18d3b26619c1c462b7a1c0226846ac0a9.zip | |
Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next
Conflicts:
drivers/iommu/iommu.c
include/linux/iommu.h