aboutsummaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorLinus Torvalds2016-08-18 11:09:43 -0700
committerLinus Torvalds2016-08-18 11:09:43 -0700
commit395c4342920b5abd082e74af3808a74f221e2fdc (patch)
tree4c998ccea353af89ec679310aed16cce30371b5e /arch/cris
parent76dcd9392af63ef8a1801ca727c20b3ccd1bff96 (diff)
parent6c16f42a4e01ef1543fb21e594c2b25d00697649 (diff)
Merge tag 'pm-4.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki: "More hibernation-related material: one fix for a recent regression in the core, one small cleanup of the x86-64 resume code and a documentation update. Specifics: - Fix a hibernate core regression resulting from uncovering a latent bug in its implementation of memory bitmaps by a recent commit (James Morse). - Use __pa() to compute a physical address in the x86-64 code finalizing resume from hibernation (Rafael Wysocki). - Update power management documentation related to system sleep states to remove outdated information from it and to add a description of a recently introduced hibernation debug feature to it (Rafael Wysocki)" * tag 'pm-4.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM / hibernate: Fix rtree_next_node() to avoid walking off list ends x86/power/64: Use __pa() for physical address computation PM / sleep: Update some system sleep documentation
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions