tree f94f71b5a542b42ecea60e6f903e3f19e5b2eada
parent 175d6146738b3d04e1adcaa4a971a3b2b0dbd8af
parent 6c274d1cd5b3aa0834e9f0c3f58038f42278ff8c
author Joerg Roedel <joerg.roedel@amd.com> 1323862891 +0100
committer Joerg Roedel <joerg.roedel@amd.com> 1323863529 +0100

Merge branch 'iommu/page-sizes' into x86/amd

Conflicts:
	drivers/iommu/amd_iommu.c