Merge branch 'acpi-assorted'