Merge branches 'acpi-ec' and 'acpi-button'