Merge branches 'acpi-tables' and 'acpica'