Merge branches 'acpi-numa', 'acpi-tables' and 'acpi-osi'