]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ba555d5 cb7a386)
Merge branch 'acpi-video'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 18 Aug 2013 22:23:27 +0000 (00:23 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 18 Aug 2013 22:23:27 +0000 (00:23 +0200)
commitcf705e810d187e3cdcc03735a9d883589d9b3e6e
tree1eab49b33ac411b0f6705489eaac64a050c689d6tree | snapshot
parentba555d55c51323602a3f0d987610205c6ebf7acfcommit | diff
parentcb7a386c6c25e85c2710cdb1a498a73794cda660commit | diff
Merge branch 'acpi-video'

* acpi-video:
  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 (with commit 952c63e)
drivers/acpi/video.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules