Merge branch 'pm-opp' into pm-cpufreq
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 4 May 2016 23:38:56 +0000 (01:38 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 4 May 2016 23:38:56 +0000 (01:38 +0200)

Trivial merge