summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-07-07 23:17:20 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-07-07 23:17:20 +0200
commit7fe39a21557b251e101671f2c3f79558a756afef (patch)
tree0cbe769361060433d68d7f9a411e0c59f699c222 /arch
parenta99cde438de0c4c0cecc1d1af1a55a75b10bfdef (diff)
parentdbd1b8ea43b17e2ed4acda72f83ea17f69408682 (diff)
parent65c0554b73c920023cc8998802e508b798113b46 (diff)
downloadlinux-7fe39a21557b251e101671f2c3f79558a756afef.tar.gz
linux-7fe39a21557b251e101671f2c3f79558a756afef.tar.xz
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