From: Joerg Roedel <jroedel@suse.de>
Date: Thu, 2 Oct 2014 10:24:45 +0000 (+0200)
Subject: Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core... 
X-Git-Tag: fixes-against-v3.18-rc2~67^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09b5269a1b3d47525d7c25efeb16f5407ef82ea2;p=pandora-kernel.git

Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next

Conflicts:
	drivers/iommu/arm-smmu.c
---

09b5269a1b3d47525d7c25efeb16f5407ef82ea2
Reading git-diff-tree failed