summaryrefslogtreecommitdiff
path: root/proto_lldp.c
diff options
context:
space:
mode:
Diffstat (limited to 'proto_lldp.c')
0 files changed, 0 insertions, 0 deletions
ve&id=0bf71e4d02ffec8ab9a6adecca61d3eed74fc99d'>9028192abac063b183d1901fbfa38a3aa6e40251 parent5372e054a1928fe704cf0a5e2e139645a777b50a (diff)parente2a738f7a88f32622684d972d654a9fed026555f (diff)
Merge branch 'smp/for-block' into smp/hotplug
Bring in the block hotplug states for consistency.
Diffstat
-rw-r--r--include/linux/cpuhotplug.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h