Merge branch 'acpi-battery'