Merge branches 'acpi-blacklist' and 'acpi-video'