Merge branches 'acpica' and 'acpi-video'