Merge branch 'acpi-fixes'