From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 26 Aug 2013 23:40:40 +0000 (+0200)
Subject: Merge branch 'acpi-video'
X-Git-Tag: v3.12-rc1~178^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a3a53ea89251314338b03dad1ae2b5cc340350f;p=pandora-kernel.git

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
---

8a3a53ea89251314338b03dad1ae2b5cc340350f
Reading git-diff-tree failed