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