From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 May 2017 05:34:52 +0000 (-0700)
Subject: Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: MMI-PSA29.97-13-9~5730
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2cc12e2e8cb65aec9a95a3d3de4d70e7b6b8c881;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'x86-cleanups-for-linus' of git://git./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.
---

2cc12e2e8cb65aec9a95a3d3de4d70e7b6b8c881