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

Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next 

Conflicts:
	drivers/iommu/iommu.c
	include/linux/iommu.h
parents 28a33cbc 2c9195e9 2c0ae172 7d43c2e4 8ce44a21 3177bb76
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