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

Merge branch 'linus' into x86/dma, to resolve a conflict with upstream 



Conflicts:
	arch/x86/mm/init_64.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 0803e605 99fec39e
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