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


Trivial merge