Merge branch 'acpi-resources'