From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 18 Jul 2014 00:57:30 +0000 (+0200)
Subject: Merge branches 'pm-sleep' and 'pm-cpufreq'
X-Git-Tag: firefly_0821_release~176^2~3597^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3962808023d54f0e1adbde403eb8e572984ccb2a;p=firefly-linux-kernel-4.4.55.git

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

* pm-sleep:
  PM / sleep: fix freeze_ops NULL pointer dereferences
  PM / sleep: Fix request_firmware() error at resume

* pm-cpufreq:
  cpufreq: make table sentinel macros unsigned to match use
  cpufreq: move policy kobj to policy->cpu at resume
  cpufreq: cpu0: OPPs can be populated at runtime
  cpufreq: kirkwood: Reinstate cpufreq driver for ARCH_KIRKWOOD
  cpufreq: imx6q: Select PM_OPP
  cpufreq: sa1110: set memory type for h3600
---

3962808023d54f0e1adbde403eb8e572984ccb2a