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

Merge branch 'linus' into x86/mm 

Conflicts:
	arch/x86/mm/fault.c
parents 0973a06c 9be260a6
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