Merge branch 'acpi-lpss'