Merge branches 'pm-devfreq' and 'acpi-pci'