Merge branches 'acpi-general', 'acpi-processor', 'acpi-lpss' and 'acpi-battery'