tree 1ad8df4ba2529135b05d8e5762557ad0da37e2f1
parent b37fa16e78d6f9790462b3181602a26b5af36260
parent 323f99cbc35c52a65dea9d072b3ecf1e662240d2
parent 80a506b8fdcfa868bb53eb740f928217d0966fc1
author Joerg Roedel <joerg.roedel@amd.com> 1280247572 +0200
committer Joerg Roedel <joerg.roedel@amd.com> 1280247572 +0200

Merge branches 'iommu-api/2.6.36' and 'amd-iommu/2.6.36' into iommu/2.6.36