Merge branch 'pm-opp' into pm-cpufreq
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 10 Feb 2016 23:24:00 +0000 (00:24 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 10 Feb 2016 23:24:00 +0000 (00:24 +0100)

Trivial merge