Merge branch 'slub/hotplug' into slab/urgent

diff --cc include/linux/memory_hotplug.h
Simple merge

diff --cc mm/memory_hotplug.c
Simple merge

diff --cc mm/slub.c
Simple merge