Merge branches 'acpi-resource' and 'acpi-pm'