Merge branch 'amd-iommu/pagetable' into amd-iommu/2.6.32
authorJoerg Roedel <joerg.roedel@amd.com>
Thu, 3 Sep 2009 15:14:57 +0000 (17:14 +0200)
committerJoerg Roedel <joerg.roedel@amd.com>
Thu, 3 Sep 2009 15:14:57 +0000 (17:14 +0200)
commit2b681fafcc50fea6304ed418667c9d04282acb73
treea950c2b32b7cb2e31bd1eb32a72d4983fd553e1e
parent03362a05c55122baff3556109c922285299dfec4
parentabdc5eb3d69279039ba6cb89719913d08013ab14
Merge branch 'amd-iommu/pagetable' into amd-iommu/2.6.32

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