Merge branch 'acpi-debug' into acpica