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