Skip to content
Commit b0d44c0d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into core/iommu

Conflicts:
	arch/x86/Kconfig
parents 9537a48e 7c730ccd
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