Merge branch 'acpi-platform' into acpi-lpss