Merge branches 'pm-opp', 'pm-cpufreq' and 'pm-tools'