Merge branch 'acpi-lpss' into acpi-enumeration