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