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)
commit12ca7c8db30d36e0ba1d00d17fc8c85f9ebfdf47
tree3b9d0cfe07c4d90dc9b21eb65f5097c75635b055
parenta52bbaf4a3b81e07430a91ee37ea76557c2c02ed
parent5ba039a55498d78a787edaf8cc915f29a17cecf3
Merge branch 'x86-apic-for-linus' of git://git./linux/kernel/git/tip/tip

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
arch/x86/kernel/apic/apic.c