From: Joerg Roedel <joerg.roedel@amd.com>
Date: Tue, 10 May 2011 08:25:23 +0000 (+0200)
Subject: Merge branches 'dma-debug/next', 'amd-iommu/command-cleanups', 'amd-iommu/ats' and... 
X-Git-Tag: v3.0-rc1~407^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=604c307bf47350c74bb36507b86a08726c7c2075;p=pandora-kernel.git

Merge branches 'dma-debug/next', 'amd-iommu/command-cleanups', 'amd-iommu/ats' and 'amd-iommu/extended-features' into iommu/2.6.40

Conflicts:
	arch/x86/include/asm/amd_iommu_types.h
	arch/x86/kernel/amd_iommu.c
	arch/x86/kernel/amd_iommu_init.c
---

604c307bf47350c74bb36507b86a08726c7c2075
Reading git-diff-tree failed