Merge branch 'smp/hotplug' into sched/core, to resolve conflicts