From: Joerg Roedel <joerg.roedel@amd.com>
Date: Thu, 3 Sep 2009 14:34:23 +0000 (+0200)
Subject: Merge branch 'amd-iommu/passthrough' into amd-iommu/2.6.32
X-Git-Tag: v2.6.32-rc1~727^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03362a05c55122baff3556109c922285299dfec4;p=pandora-kernel.git

Merge branch 'amd-iommu/passthrough' into amd-iommu/2.6.32

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

03362a05c55122baff3556109c922285299dfec4
Reading git-diff-tree failed