From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 7 Jul 2016 21:17:20 +0000 (+0200)
Subject: Merge branches 'pm-cpuidle-fixes' and 'pm-sleep-fixes'
X-Git-Tag: v4.7-rc7~16^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7fe39a21557b251e101671f2c3f79558a756afef;p=linux.git

Merge branches 'pm-cpuidle-fixes' and 'pm-sleep-fixes'

* pm-cpuidle-fixes:
  cpuidle: Fix last_residency division

* pm-sleep-fixes:
  x86/power/64: Fix kernel text mapping corruption during image restoration
---

7fe39a21557b251e101671f2c3f79558a756afef