Merge branches 'acpi-ec', 'acpi-video', 'acpi-button' and 'acpi-thermal'