25c87f7f2a
Conflicts: drivers/acpi/video.c Signed-off-by: Len Brown <len.brown@intel.com>
Conflicts: drivers/acpi/video.c Signed-off-by: Len Brown <len.brown@intel.com>