Merge "msm: idle-v7.S: Warmboot support for NR_CPUS >= 2" into msm-3.0