Merge branch 'acpi-misc'