Merge branch 'acpi-fixes' into fixes