Merge branch 'amd-iommu/passthrough' into amd-iommu/2.6.32
authorJoerg Roedel <joerg.roedel@amd.com>
Thu, 3 Sep 2009 14:34:23 +0000 (16:34 +0200)
committerJoerg Roedel <joerg.roedel@amd.com>
Thu, 3 Sep 2009 14:34:23 +0000 (16:34 +0200)
commit03362a05c55122baff3556109c922285299dfec4
tree85f83fbf4e1e8027eca05fbd8285041053a713c4
parent85da07c409daba3d067824f0051d58f70cb571a0
parent4751a95134e05f1172131d2001c6991d671fa58c
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
arch/x86/include/asm/amd_iommu_types.h
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c