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

Merge branch 'linus' into x86/iommu 



Conflicts:
	lib/swiotlb.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 98216260 6bfb09a1
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