Merge branch 'pm-opp' into pm-cpufreq
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 1 Jan 2016 23:49:05 +0000 (00:49 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 1 Jan 2016 23:49:05 +0000 (00:49 +0100)

Trivial merge