Merge branch 'pm-opp' into pm-cpufreq