OSDN Git Service

Merge 'x86/urgent' into x86/cpu
authorBorislav Petkov <bp@suse.de>
Thu, 7 May 2020 10:27:43 +0000 (12:27 +0200)
committerBorislav Petkov <bp@suse.de>
Thu, 7 May 2020 10:27:43 +0000 (12:27 +0200)
... to resolve conflicting changes to arch/x86/kernel/apic/apic.c

Signed-off-by: Borislav Petkov <bp@suse.de>

Trivial merge