Merge branch 'acpi-video'

* acpi-video:
  ACPI: blacklist win8 OSI for buggy laptops
  ACPI: blacklist win8 OSI for ASUS Zenbook Prime UX31A
  ACPI / video: drop unused fields from struct acpi_video_brightness_flags
  ACPI / video: remove unnecessary type casting
  ACPI / video: trivial style cleanups
  ACPI / video: trivial costmetic cleanups

Conflicts:
	drivers/acpi/video.c

diff --cc drivers/acpi/video.c
index c86fc0c,159c935..aebcf63
--- 1/drivers/acpi/video.c
--- 2/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@ -900,12 -904,9 +891,12 @@@ static void acpi_video_device_find_cap(
                acpi_handle acpi_parent;
                struct device *parent = NULL;
                int result;
-               static int count = 0;
+               static int count;
                char *name;
  
 +              result = acpi_video_init_brightness(device);
 +              if (result)
 +                      return;
                name = kasprintf(GFP_KERNEL, "acpi_video%d", count);
                if (!name)
                        return;