Merge branches 'pm-cpufreq-fixes' and 'pm-sleep-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 4 Mar 2016 21:41:05 +0000 (22:41 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 4 Mar 2016 21:41:05 +0000 (22:41 +0100)
commitbfc6b97d528def357adcbdadf71b21c8e5f7dbc4
tree3fe087169320a608b62decc7bf28dbb003b499ec
parentfc77dbd34c5c99bce46d40a2491937c3bcbd10af
parent3c2002aec3ee3a9fc86ff8f8618f1253c94ec919
parent92f9e179a702a6adbc11e2fedc76ecd6ffc9e3f7
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