Merge branch 'pm-opp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 Sep 2015 13:37:17 +0000 (15:37 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 11 Sep 2015 13:37:17 +0000 (15:37 +0200)
commit7c976664d537bca19c9bf892b4d9e5ab7ecea927
treedf910dfff1eef04c3d5e9dc585579ae4e96c42ba
parentae982073095a44f004d7ffb9f271077abef9dbcf
parent1b2b90cbea00670221f062814dc8bcecb3af7b90
Merge branch 'pm-opp'

* pm-opp:
  PM / OPP: Return suspend_opp only if it is enabled
  PM / OPP: add dev_pm_opp_get_suspend_opp() helper
drivers/base/power/opp.c