diff options
| author |   Joerg Roedel <joerg.roedel@amd.com> | 2009-11-03 12:05:40 +0100 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-11-03 12:05:40 +0100 |
| commit | 342688f9db392ec82ab9e6b25a6137f9ee1647d7 (patch) | |
| tree | e55eca548851778a559674e467e34574ae2c633a /arch/x86 | |
| parent | Linux 2.6.32-rc5 (diff) | |
| parent | x86/amd-iommu: Un__init function required on shutdown (diff) | |
| parent | dma-debug: Fix compile warning with PAE enabled (diff) | |
| download | linux-dev-342688f9db392ec82ab9e6b25a6137f9ee1647d7.tar.xz linux-dev-342688f9db392ec82ab9e6b25a6137f9ee1647d7.zip | |
Merge branches 'amd-iommu/fixes' and 'dma-debug/fixes' into iommu/fixes