| commit | 8a3a53ea89251314338b03dad1ae2b5cc340350f | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Aug 27 01:40:40 2013 +0200 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Aug 27 01:40:40 2013 +0200 |
| tree | 67d061d0848757ef1fc07a100d877c78e1aefd78 | |
| parent | 551f5c74e17ba9257cdc35bf657ee448cad2d5b0 [diff] | |
| parent | 94fb9823a7c478bf88b99b8da4fc3e540608ece5 [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