tree 0cbe769361060433d68d7f9a411e0c59f699c222
parent a99cde438de0c4c0cecc1d1af1a55a75b10bfdef
parent dbd1b8ea43b17e2ed4acda72f83ea17f69408682
parent 65c0554b73c920023cc8998802e508b798113b46
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1467926240 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1467926240 +0200

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