Merge "msm: cpuidle: Don't disable irqs again" into msm-3.4