Merge back earlier 'pm-cpuidle' material.