Merge branch 'pm-acpi'