Merge branches 'acpi-tables' and 'acpi-general'