Merge branch 'acpi-tools'