Merge branches 'acpi-utils', 'acpi-video', 'acpi-soc' and 'acpi-button'