From: Rafael J. Wysocki Date: Fri, 11 Sep 2015 13:37:17 +0000 (+0200) Subject: Merge branch 'pm-opp' X-Git-Tag: firefly_0821_release~176^2~1072^2~2 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=7c976664d537bca19c9bf892b4d9e5ab7ecea927;p=firefly-linux-kernel-4.4.55.git 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 --- 7c976664d537bca19c9bf892b4d9e5ab7ecea927