Merge branch 'acpi-utils'