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

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

Conflicts:
	drivers/iommu/arm-smmu.c
parents fe82dcec f171abab a6fda0f5 dedd9431 80f7b3d1 c50e3247 5fc24d8c
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