From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 18 Dec 2016 19:06:05 +0000 (-0800)
Subject: Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: Ubuntu-4.10.0-19.21~1946
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=98da295b35cf23222b52a3dc1d768b7997c95a32;p=mirror_ubuntu-artful-kernel.git

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

Pull SMP hotplug fixes from Thomas Gleixner:
 "Two fixlets for cpu hotplug:

   - Fix a subtle ordering problem with the dummy timer. This happened
     to work before the conversion by chance due to initcall ordering.

   - Fix the function comment for __cpuhp_setup_state()"

* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpu/hotplug: Clarify description of __cpuhp_setup_state() return value
  clocksource/dummy_timer: Move hotplug callback after the real timers
---

98da295b35cf23222b52a3dc1d768b7997c95a32