From: Joerg Roedel <jroedel@suse.de>
Date: Thu, 2 Apr 2015 11:33:19 +0000 (+0200)
Subject: Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/tegra' and... 
X-Git-Tag: omap-for-v4.1/fixes-rc1~83^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f65ef01e131650d455875598099cd06fea6096b;p=pandora-kernel.git

Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/tegra' and 'core' into next

Conflicts:
	drivers/iommu/amd_iommu.c
	drivers/iommu/tegra-gart.c
	drivers/iommu/tegra-smmu.c
---

7f65ef01e131650d455875598099cd06fea6096b
Reading git-diff-tree failed