From: Joerg Roedel <joro@8bytes.org>
Date: Wed, 16 Apr 2014 14:09:40 +0000 (+0200)
Subject: Merge git://git.infradead.org/iommu-2.6 into iommu/fixes
X-Git-Tag: iommu-fixes-v3.15-rc1^0
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3426cb3d3578eab55ec231e0ce4dfc12ec3abc1f;p=users%2Fdwmw2%2Flinux.git

Merge git://git.infradead.org/iommu-2.6 into iommu/fixes
---

3426cb3d3578eab55ec231e0ce4dfc12ec3abc1f