Merge branch 'acpi-ec'