summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-08-12 22:53:58 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-08-12 22:53:58 +0200
commit0aeeb3e73f5fd7faef3dce8cb590effd6ee51571 (patch)
treec9f12d6b28aa2e3d58d55b70c3913b553490f26c /arch
parent29b4817d4018df78086157ea3a55c1d9424a7cfc (diff)
parent62822e2ec4ad091ba31f823f577ef80db52e3c2c (diff)
parent8e85946777d3f667085f298c0acfec12fe105078 (diff)
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()