]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6b5370ae57c2b7c56f41973cf5bc4c9b5929778e
tree8448ece35101d8db945c49df50d0d5889687de9f
parente2dc349ccbac2da0ccb859e9309d4a4f6eed081a
parent701d7ce19155bab1f9bb2e6a26d165f628ebf825
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