summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-13 00:35:38 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-13 00:35:38 +0200
commit34a1b99b9b4d81b0d835c08239c1180e83703bb7 (patch)
treed2cad169b136eebc6ffde41de6b36b229385db2e /drivers/media
parent14bd8d745afc1d84b1aae5357a8917127730373c (diff)
parent8a5de52afc5f9a20a356e49351292d098cc455b2 (diff)
parent64491882d399011bb0a4603e8cf481b65f0d3c5d (diff)
Merge branches 'acpi-blacklist' and 'acpi-video'
* acpi-blacklist: ACPI / blacklist: Disable Vista compatibility for Sony VGN-SR19XN. * acpi-video: ACPI / video: Add force native backlight quirk for Lenovo Ideapad Z570 ACPI / video: Allow forcing native backlight on non win8 machines