Merge branches 'acpi-fan', 'acpi-ec', 'acpi-drivers' and 'acpi-osl'