Merge branch 'smp/for-block' into smp/hotplug
authorThomas Gleixner <tglx@linutronix.de>
Wed, 21 Sep 2016 07:39:00 +0000 (09:39 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 21 Sep 2016 07:39:00 +0000 (09:39 +0200)
commit0bf71e4d02ffec8ab9a6adecca61d3eed74fc99d
tree9028192abac063b183d1901fbfa38a3aa6e40251
parent5372e054a1928fe704cf0a5e2e139645a777b50a
parente2a738f7a88f32622684d972d654a9fed026555f
Merge branch 'smp/for-block' into smp/hotplug

Bring in the block hotplug states for consistency.
include/linux/cpuhotplug.h