Merge branch 'pm-cpuidle-fixes'