Skip to content
Commit 51485635 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

Merge 'x86/urgent' into x86/cpu 



... to resolve conflicting changes to arch/x86/kernel/apic/apic.c

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parents e9d71445 fb9cbbc8
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment