summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-07-25 13:44:32 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-07-25 13:44:32 +0200
commit7f234a4d8aab23e778933808a88bfa47ea4fdc2a (patch)
tree5cb40fbdeb7c5831dbff7731213502491a4ded97 /kernel
parent523d939ef98fd712632d93a5a2b588e477a7565e (diff)
parentfe12c00d21bb4985fa8da282942250be21e7dd59 (diff)
parentaf1e45e6ab5f0f32a0b68a0d4bb28af7907c6192 (diff)
downloadlinux-7f234a4d8aab23e778933808a88bfa47ea4fdc2a.tar.bz2
Merge branches 'pm-sleep' and 'pm-tools'
* pm-sleep: PM / hibernate: Introduce test_resume mode for hibernation x86 / hibernate: Use hlt_play_dead() when resuming from hibernation PM / hibernate: Image data protection during restoration PM / hibernate: Add missing braces in __register_nosave_region() PM / hibernate: Clean up comments in snapshot.c PM / hibernate: Clean up function headers in snapshot.c PM / hibernate: Add missing braces in hibernate_setup() PM / hibernate: Recycle safe pages after image restoration PM / hibernate: Simplify mark_unsafe_pages() PM / hibernate: Do not free preallocated safe pages during image restore PM / suspend: show workqueue state in suspend flow PM / sleep: make PM notifiers called symmetrically PM / sleep: Make pm_prepare_console() return void PM / Hibernate: Don't let kasan instrument snapshot.c * pm-tools: PM / tools: scripts: AnalyzeSuspend v4.2 tools/turbostat: allow user to alter DESTDIR and PREFIX