Merge "ARM: 6993/1: platsmp: Allow secondary cpu hotplug with maxcpus=1" into msm-3.0