Merge branch 'acpi-trace'