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)
* pm-opp:
  PM / OPP: Return suspend_opp only if it is enabled
  PM / OPP: add dev_pm_opp_get_suspend_opp() helper

1  2 
drivers/base/power/opp.c

Simple merge