Pull video into release branch

Conflicts:

	drivers/acpi/video.c

Signed-off-by: Len Brown <len.brown@intel.com>

diff --cc drivers/acpi/video.c
index d05891f16282338d96d5cf5a5f3f22d30d6cd5c0,8a60a3d7001cdbb02c332911ee23326e583197be..f31e3c8749e0ae48f805489538346882eaf79ee8
--- 1/drivers/acpi/video.c
--- 2/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@ -415,8 -415,11 +415,11 @@@ acpi_video_device_lcd_set_level(struct 
  
  
        arg0.integer.value = level;
-       status = acpi_evaluate_object(device->dev->handle, "_BCM", &args, NULL);
 +
+       if (device->cap._BCM)
+               status = acpi_evaluate_object(device->dev->handle, "_BCM",
+                                             &args, NULL);
+       device->brightness->curr = level;
 -      printk(KERN_DEBUG "set_level status: %x\n", status);
        return status;
  }