diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-27 01:40:40 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-27 01:40:40 +0200 |
| commit | 8a3a53ea89251314338b03dad1ae2b5cc340350f (patch) | |
| tree | 67d061d0848757ef1fc07a100d877c78e1aefd78 /drivers/base | |
| parent | Merge branch 'acpi-processor' (diff) | |
| parent | ACPI: blacklist win8 OSI for buggy laptops (diff) | |
| download | linux-dev-8a3a53ea89251314338b03dad1ae2b5cc340350f.tar.xz linux-dev-8a3a53ea89251314338b03dad1ae2b5cc340350f.zip | |
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
Diffstat (limited to 'drivers/base')
0 files changed, 0 insertions, 0 deletions