Merge branches 'acpi-pm', 'acpi-battery' and 'acpi-ac'