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

Merge branch 'linus' into x86/apic, to resolve conflicts 



Conflicts:
	arch/x86/include/asm/x2apic.h

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents c201c917 e4880bc5
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