tree 03239ac2aef395c4d89ca094463e6d86bd5c9183
parent 11634bd6682d5979fa10fdc01cd74577827377bd
parent 653a3538f865d26350727df25397bee2bacde773
parent 2b1987a9f1e6250c962ca13820d3c69817879266
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1405645050 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1405645050 +0200

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