]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'iommu/page-sizes' into x86/amd
authorJoerg Roedel <joerg.roedel@amd.com>
Wed, 14 Dec 2011 11:41:31 +0000 (12:41 +0100)
committerJoerg Roedel <joerg.roedel@amd.com>
Wed, 14 Dec 2011 11:52:09 +0000 (12:52 +0100)
commita06ec394c9318e2ee9209ca3c106d3fa6fbfeb00
treef94f71b5a542b42ecea60e6f903e3f19e5b2eada
parent175d6146738b3d04e1adcaa4a971a3b2b0dbd8af
parent6c274d1cd5b3aa0834e9f0c3f58038f42278ff8c
Merge branch 'iommu/page-sizes' into x86/amd

Conflicts:
drivers/iommu/amd_iommu.c
drivers/iommu/amd_iommu.c
drivers/iommu/intel-iommu.c
drivers/iommu/omap-iovmm.c