Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Aug 2018 19:21:46 +0000 (12:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Aug 2018 19:21:46 +0000 (12:21 -0700)
commit1c594774283a7cfe6dc0f8ffdfb2dbfc497502c4
tree67e092bc8a058c7b4986aa582b87497a69e8bd64
parentf7951c33f0fed14ee26651a70a46899a59a31e18
parentd018031f562b9c2eff038969ab1955a370c52d8f
Merge branch 'smp-hotplug-for-linus' of git://git./linux/kernel/git/tip/tip

Pull CPU hotplug update from Thomas Gleixner:
 "A trivial name fix for the hotplug state machine"

* 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpu/hotplug: Clarify CPU hotplug step name for timers
kernel/cpu.c