Merge branch 'acpi-ipmi'