Merge branches 'acpi-config', 'acpi-osl', 'acpi-utils' and 'acpi-tables'