Skip to content
Commit 365d46dc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/xen 

Conflicts:
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/process_64.c
	arch/x86/xen/enlighten.c
parents 5dc64a34 fd048088
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