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

Merge branches 'x86/urgent' and 'x86/pat' into x86/core 

Conflicts:
	arch/x86/include/asm/pat.h
parents 13b2eda6 13093cb0
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