Merge branch 'acpi-video'