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

Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next 

Conflicts:
	drivers/iommu/amd_iommu_types.h
parents 6a13feb9 b61e5e80 3ca9299e 166bdbd2 8128f23c 1228236d 393c092a
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