tree 63f81a2d04658d6000ce5edf2d39d06bbbc18136
parent aaed4d0bddaef70640fa8ac0d52a380e2d3c6101
parent 6cfeaf5125d425043d44002d0a1a8a147be582bf
author Linus Torvalds <torvalds@linux-foundation.org> 1474223926 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1474223926 -0700

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

Pull SMP build fixlet from Thomas Gleixner:
 "Add a missing include in cpuhotplug.h"

* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpu/hotplug: Include linux/types.h in linux/cpuhotplug.h