From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 4 Mar 2016 21:41:05 +0000 (+0100)
Subject: Merge branches 'pm-cpufreq-fixes' and 'pm-sleep-fixes'
X-Git-Tag: MMI-PSA29.97-13-9~8424^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bfc6b97d528def357adcbdadf71b21c8e5f7dbc4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

* pm-cpufreq-fixes:
  cpufreq: mediatek: allow building as a module
  cpufreq: qoriq: allow building as module with THERMAL=m

* pm-sleep-fixes:
  PM / sleep / x86: Fix crash on graph trace through x86 suspend
---

bfc6b97d528def357adcbdadf71b21c8e5f7dbc4