From: Joerg Roedel <joerg.roedel@amd.com>
Date: Tue, 27 Jul 2010 16:19:32 +0000 (+0200)
Subject: Merge branches 'iommu-api/2.6.36' and 'amd-iommu/2.6.36' into iommu/2.6.36
X-Git-Tag: v2.6.36-rc1~534^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7a42c4ff02d1bd764804a4ba36c2b839070c5e7d;p=linux.git

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

7a42c4ff02d1bd764804a4ba36c2b839070c5e7d