Merge branches 'acpi-ec', 'acpi-soc', 'acpi-video' and 'acpi-resources'