From: Joerg Roedel <joerg.roedel@amd.com>
Date: Thu, 28 May 2009 16:23:56 +0000 (+0200)
Subject: Merge branches 'amd-iommu/fixes', 'amd-iommu/debug', 'amd-iommu/suspend-resume' and... 
X-Git-Tag: v2.6.31-rc1~408^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83cce2b69eaa4bc7535f98f75b79397baf277470;p=pandora-kernel.git

Merge branches 'amd-iommu/fixes', 'amd-iommu/debug', 'amd-iommu/suspend-resume' and 'amd-iommu/extended-allocator' into amd-iommu/2.6.31

Conflicts:
	arch/x86/kernel/amd_iommu.c
	arch/x86/kernel/amd_iommu_init.c
---

83cce2b69eaa4bc7535f98f75b79397baf277470
Reading git-diff-tree failed