Merge branch 'pm-qos' into acpi-pm