]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 May 2017 04:41:07 +0000 (21:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 May 2017 04:41:07 +0000 (21:41 -0700)
Pull x86 apic updates from Ingo Molnar:
 "Two small cleanups"

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Fix a comment in init_apic_mappings()
  x86/apic: Remove the SET_APIC_ID(x) macro

1  2 
arch/x86/kernel/apic/apic.c

Simple merge