From: Joerg Roedel <joerg.roedel@amd.com>
Date: Tue, 2 Oct 2012 12:40:03 +0000 (+0200)
Subject: Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd',... 
X-Git-Tag: v3.7-rc1~93^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=009487258399cb4f431992919fa0f386d1b74ceb;p=pandora-kernel.git

Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next

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

009487258399cb4f431992919fa0f386d1b74ceb
Reading git-diff-tree failed