From: Joerg Roedel <jroedel@suse.de>
Date: Wed, 4 Feb 2015 15:53:44 +0000 (+0100)
Subject: Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and ... 
X-Git-Tag: fixes-v4.0-rc1~123^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a20cc76b9efae10c20123049df361adcd7f0e0b3;p=pandora-kernel.git

Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next

Conflicts:
	drivers/iommu/Kconfig
	drivers/iommu/Makefile
---

a20cc76b9efae10c20123049df361adcd7f0e0b3
Reading git-diff-tree failed