Merge branch 'pm-cpuidle' into fixes