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

Merge branch 'x86/fixmap' into x86/devel 



Conflicts:

	arch/x86/mm/init_64.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents e3ae0acf 8b7ef4ec
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