Merge branch 'acpi-ec' into acpi-pm