Merge branch 'acpi-fan'