Merge branches 'iommu-api/2.6.36' and 'amd-iommu/2.6.36' into iommu/2.6.36
authorJoerg Roedel <joerg.roedel@amd.com>
Tue, 27 Jul 2010 16:19:32 +0000 (18:19 +0200)
committerJoerg Roedel <joerg.roedel@amd.com>
Tue, 27 Jul 2010 16:19:32 +0000 (18:19 +0200)
commit7a42c4ff02d1bd764804a4ba36c2b839070c5e7d
tree1ad8df4ba2529135b05d8e5762557ad0da37e2f1
parentb37fa16e78d6f9790462b3181602a26b5af36260
parent323f99cbc35c52a65dea9d072b3ecf1e662240d2
parent80a506b8fdcfa868bb53eb740f928217d0966fc1
Merge branches 'iommu-api/2.6.36' and 'amd-iommu/2.6.36' into iommu/2.6.36