Merge commit 'smp-hotplug^{/omap2}' into for-linus