Merge branches 'fixes', 'misc' and 'smp-hotplug' into for-next