From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 9 Sep 2016 20:34:16 +0000 (+0200)
Subject: Merge branches 'pm-core-fixes' and 'pm-cpufreq-fixes'
X-Git-Tag: v6.1~15858^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a2a835bbcaa6af0ec659606d3eabc23ccaaab80;p=sdk%2Femulator%2Femulator-kernel.git

Merge branches 'pm-core-fixes' and 'pm-cpufreq-fixes'

* pm-core-fixes:
  PM / QoS: avoid calling cancel_delayed_work_sync() during early boot

* pm-cpufreq-fixes:
  cpufreq-stats: Minor documentation fix
---

8a2a835bbcaa6af0ec659606d3eabc23ccaaab80