Merge branches 'acpi-general' and 'acpi-video'