Merge branch 'cpuidle-gen' into pm-cpuidle