Merge branches 'acpi-scan', 'acpi-ec' and 'acpi-lpss'