Merge branch 'pm-opp' into pm-cpufreq
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 9 Sep 2015 00:21:06 +0000 (02:21 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 9 Sep 2015 00:21:06 +0000 (02:21 +0200)

Trivial merge