From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 3 Sep 2017 22:07:27 +0000 (+0200)
Subject: Merge branch 'pm-docs'
X-Git-Tag: v4.14-rc1~139^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4afbce7b39d2b326616f0a87a6246b1383237868;p=linux.git

Merge branch 'pm-docs'

* pm-docs:
  PM: docs: Delete the obsolete states.txt document
  PM: docs: Describe high-level PM strategies and sleep states
---

4afbce7b39d2b326616f0a87a6246b1383237868