Merge branches 'acpi-video' and 'acpi-cppc'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 7 Nov 2015 00:30:22 +0000 (01:30 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 7 Nov 2015 00:30:22 +0000 (01:30 +0100)
commit3930f660b4eea1de077969174e6e055d51413fab
treefa6275e5b3d4cb313f1a341c1e776a08ab149aef
parentf2115faaf0df42623638dfbfc5bdaab6ef7375ab
parente50b9be14ab0ed10b0b3cd4112ff4bed0abf7b6f
parentefb2d3be53e4343ab6495729b3ec9ffb95261035
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()