Merge branch 'cpu-hotplug'