]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'acpi-video'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 Aug 2013 23:40:40 +0000 (01:40 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 Aug 2013 23:40:40 +0000 (01:40 +0200)
commit0ba923b6bf15b0fc655300b6e89f94bf8de0c85d
tree67d061d0848757ef1fc07a100d877c78e1aefd78
parentf20ce0ac25c459979cb47940f86e24d9d4428fff
parent49f0a257307994c290c2418faa311d645d4ef074
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
drivers/acpi/video.c