Merge branch 'pm-opp' into pm-cpufreq
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 1 Dec 2014 01:46:54 +0000 (02:46 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 1 Dec 2014 01:46:54 +0000 (02:46 +0100)

Trivial merge