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

Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next 

Conflicts:
	drivers/iommu/Kconfig
	drivers/iommu/Makefile
parents bb590c90 a4188bee 1d7f449c cd70d465 ae0cbbb1 63ce3ae8
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