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

Merge branch 'x86/urgent' into x86/pat 



Conflicts:
	arch/x86/mm/pageattr.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents ab7e7924 38cc1c3d
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