From: Joerg Roedel <joerg.roedel@amd.com>
Date: Fri, 21 Oct 2011 12:38:55 +0000 (+0200)
Subject: Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu... 
X-Git-Tag: v3.2-rc1~117^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1abb4ba596a91a839f82e0c9c837b777d574e83d;p=pandora-kernel.git

Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next

Conflicts:
	drivers/iommu/amd_iommu.c
	drivers/iommu/iommu.c
---

1abb4ba596a91a839f82e0c9c837b777d574e83d
Reading git-diff-tree failed