diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2009-05-28 18:23:56 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-05-28 18:23:56 +0200 |
| commit | 83cce2b69eaa4bc7535f98f75b79397baf277470 (patch) | |
| tree | 538c3e7c6d587ce6f57ca65bb2cd4e805fbfc312 | |
| parent | amd iommu: properly detach from protection domain on ->remove (diff) | |
| parent | amd-iommu: disable device isolation with CONFIG_IOMMU_STRESS (diff) | |
| parent | amd-iommu: implement suspend/resume (diff) | |
| parent | amd-iommu: don't free dma adresses below 512MB with CONFIG_IOMMU_STRESS (diff) | |
| download | linux-83cce2b69eaa4bc7535f98f75b79397baf277470.tar.xz linux-83cce2b69eaa4bc7535f98f75b79397baf277470.zip | |
Merge branches 'amd-iommu/fixes', 'amd-iommu/debug', 'amd-iommu/suspend-resume' and 'amd-iommu/extended-allocator' into amd-iommu/2.6.31
Conflicts:
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c