From: Joerg Roedel 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: firefly_0821_release~9833^2~1269^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7a42c4ff02d1bd764804a4ba36c2b839070c5e7d;p=firefly-linux-kernel-4.4.55.git Merge branches 'iommu-api/2.6.36' and 'amd-iommu/2.6.36' into iommu/2.6.36 --- 7a42c4ff02d1bd764804a4ba36c2b839070c5e7d