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

Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next 

Conflicts:
	drivers/iommu/amd_iommu.c
	drivers/iommu/intel-iommu.c
	include/linux/iommu.h
parents 00fb5430 95bdaf71
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