Skip to content
Commit a06ec394 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

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

Conflicts:
	drivers/iommu/amd_iommu.c
parents 175d6146 6c274d1c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment