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

Merge branch 'linus' into x86/x2apic 



Conflicts:

	arch/x86/kernel/genapic_64.c

Manual merge:

	arch/x86/kernel/genx2apic_uv_x.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 7ab6af7a 796aadeb
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