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

Merge branch 'linus' into x86/pat2 

Conflicts:
	arch/x86/mm/init_64.c
parents b27a43c1 d403a648
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