From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 25 Jul 2016 11:44:32 +0000 (+0200)
Subject: Merge branches 'pm-sleep' and 'pm-tools'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7f234a4d8aab23e778933808a88bfa47ea4fdc2a;p=linux-beck.git

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
---

7f234a4d8aab23e778933808a88bfa47ea4fdc2a