tree 0c10dbd82bead349ee0cb61046f5d82d520877be
parent 66acd7fc9415bc05482b829e7de4073c1072b1de
parent 0ccecd95e797f0c383a43278fcca74d47cd8a785
author Linus Torvalds <torvalds@linux-foundation.org> 1493703292 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1493703292 -0700

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cleanups from Ingo Molnar:
 "A handful of small cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/irq: Remove a redundant #ifdef directive
  x86/smp: Remove the redundant #ifdef CONFIG_SMP directive
  x86/smp: Reduce code duplication
  x86/pci-calgary: Use setup_timer() instead of open coding it.