Merge branches 'acpi-battery', 'acpi-video', 'acpi-fan' and 'acpi-drivers'