Merge back earlier 'acpi-lpss' material for v3.18.