Merge branch 'pm-qos' into pm-cpuidle