projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 551f5c7 94fb982)
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)
commit8a3a53ea89251314338b03dad1ae2b5cc340350f
tree67d061d0848757ef1fc07a100d877c78e1aefd78tree | snapshot
parent551f5c74e17ba9257cdc35bf657ee448cad2d5b0commit | diff
parent94fb9823a7c478bf88b99b8da4fc3e540608ece5commit | diff
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 diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.