Merge "msm: smp: cold and warm boot support for 4 cpus" into msm-3.0