Merge branches 'acpi-properties', 'acpi-tables', 'acpi-x86' and 'acpi-soc'