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)
commitc6f48119a1771c078dce0fca3ede77cd0062e2e4
tree8f21aa9b5f1cd736722ba0d58d6c6b3eaf4b6ff8
parent7a6c79f2fe53dac9b7b290f3a4c56b0958e19201
parentd9de19b1cc013433ad293365b5b3902ec73dfd60
Merge branch 'pm-opp' into pm-cpufreq