Merge branches 'pm-domains' and 'pm-cpufreq'