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)
commit9d066a252786e1a18484a6283f82614d42a9f4ac
tree72188d2f86b3d0c4100257c8d5734f2c648a8bc7
parent79ee2e8f730411a30b271d5f9cdeae189fa66174
parentb00345d1994d588fa2687e1238fcd542f0320cba
Merge branches 'pm-opp' and 'pm-cpufreq-fixes'

* 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