Merge branches 'pm-cpufreq-fixes' and 'pm-tools-fixes'