Merge branches 'acpi-battery' and 'pm-cpufreq'