Merge branch 'iommu/largepages' into amd-iommu/2.6.35
authorJoerg Roedel <joerg.roedel@amd.com>
Tue, 11 May 2010 15:40:57 +0000 (17:40 +0200)
committerJoerg Roedel <joerg.roedel@amd.com>
Tue, 11 May 2010 15:40:57 +0000 (17:40 +0200)
commit795e74f7a69f9c08afa4fa7c86cc4f18a62bd630
tree8448ece35101d8db945c49df50d0d5889687de9f
parenta52357259680fe5368c2fabf5949209e231f2aa2
parent12c7389abe5786349d3ea6da1961cf78d0c1c7cd
Merge branch 'iommu/largepages' into amd-iommu/2.6.35

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