Skip to content
GitLab
Commit e4f807c2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/xen 



Conflicts:
	arch/x86/kernel/paravirt.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 25258ef7 83097aca
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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