Merge branch 'pm-cpuidle'