summaryrefslogtreecommitdiff
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-11-07 01:30:22 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-11-07 01:30:22 +0100
commit3930f660b4eea1de077969174e6e055d51413fab (patch)
treefa6275e5b3d4cb313f1a341c1e776a08ab149aef /drivers/cpufreq
parentf2115faaf0df42623638dfbfc5bdaab6ef7375ab (diff)
parente50b9be14ab0ed10b0b3cd4112ff4bed0abf7b6f (diff)
parentefb2d3be53e4343ab6495729b3ec9ffb95261035 (diff)
Merge branches 'acpi-video' and 'acpi-cppc'
* acpi-video: ACPI / video: only register backlight for LCD device ACPI / video: Add a quirk to force acpi-video backlight on Dell XPS L421X * acpi-cppc: cpufreq: CPPC: Delete an unnecessary check before the function call kfree()