From: Joerg Roedel <jroedel@suse.de>
Date: Tue, 2 Dec 2014 12:07:13 +0000 (+0100)
Subject: Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu',... 
X-Git-Tag: omap-for-v3.19/fixes-rc1~106^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76771c938e95ce4106c6e8092f4f614d4d1e0ecc;p=pandora-kernel.git

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

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

76771c938e95ce4106c6e8092f4f614d4d1e0ecc
Reading git-diff-tree failed