Merge branch 'pm-qos' into acpi-dev-pm

Material in the 'acpi-dev-pm' branch depends on 'pm-qos' commits.