Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'acpi-resources'