Merge branches 'acpi-button', 'acpi-battery' and 'acpi-doc'