Merge "cpufreq: fix interactive bug during hotplug" into msm-3.4