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