Merge branches 'acpi-ec', 'acpi-fan' and 'acpi-pci'