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)

Trivial merge