Merge branch 'pm-opp' into pm-cpufreq
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 12 Dec 2015 01:47:36 +0000 (02:47 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 12 Dec 2015 01:47:36 +0000 (02:47 +0100)

Trivial merge