]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
Merge branches 'pm-opp' and 'pm-cpufreq-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 17 Jun 2016 23:55:13 +0000 (01:55 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 17 Jun 2016 23:55:13 +0000 (01:55 +0200)
* pm-opp:
  PM / OPP: Add 'UNKNOWN' status for shared_opp in struct opp_table

* pm-cpufreq-fixes:
  cpufreq: intel_pstate: Adjust _PSS[0] freqeuency if needed


Trivial merge