diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-15 14:09:45 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-15 14:09:45 +0200 |
| commit | 75fa7d2826b520ad278512a39f9450d03265ed12 (patch) | |
| tree | fdd4f4a98d714f0c3651e0da565adfa223054cb0 | |
| parent | 3011ef60d8406ad549f99cf40b2bbd6df095ce73 (diff) | |
| parent | 5ff365fb6aed4c7ee5aae7b0239ce0b514aefabc (diff) | |
| parent | f6e6e1b9fee88c90586787b71dc49bb3ce62bb89 (diff) | |
Merge branches 'acpi-video' and 'acpi-blacklist'
* acpi-video:
ACPI / video: correct DMI tag for Dell Inspiron 7520
ACPI / video: Add use_native_backlight quirks for more systems
* acpi-blacklist:
ACPI / blacklist: Add dmi_enable_osi_linux quirk for Asus EEE PC 1015PX
ACPI: blacklist win8 OSI for Dell Inspiron 7737