diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2010-07-27 18:19:32 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2010-07-27 18:19:32 +0200 |
| commit | 7a42c4ff02d1bd764804a4ba36c2b839070c5e7d (patch) | |
| tree | 1ad8df4ba2529135b05d8e5762557ad0da37e2f1 /arch | |
| parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) | |
| parent | 323f99cbc35c52a65dea9d072b3ecf1e662240d2 (diff) | |
| parent | 80a506b8fdcfa868bb53eb740f928217d0966fc1 (diff) | |
Merge branches 'iommu-api/2.6.36' and 'amd-iommu/2.6.36' into iommu/2.6.36