Merge branch 'acpi-dsc'