Merge branches 'acpi-video' and 'acpi-x86'