tree c9f12d6b28aa2e3d58d55b70c3913b553490f26c
parent 29b4817d4018df78086157ea3a55c1d9424a7cfc
parent 62822e2ec4ad091ba31f823f577ef80db52e3c2c
parent 8e85946777d3f667085f298c0acfec12fe105078
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1471035238 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1471035238 +0200

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

* pm-sleep:
  PM / hibernate: Restore processor state before using per-CPU variables
  x86/power/64: Always create temporary identity mapping correctly

* pm-cpufreq:
  cpufreq: powernv: Fix crash in gpstate_timer_handler()