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)
Conflicts:
arch/x86/kernel/amd_iommu.c


No differences found