Merge back earlier 'acpi-lpss' material for 3.18-rc1