Merge branches 'acpica', 'acpi-video' and 'acpi-fan'