Merge branches 'acpi-processor', 'acpi-battery', 'acpi-utils' and 'acpi-fan'