summaryrefslogtreecommitdiffstats
path: root/Documentation/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-02-20 14:26:13 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-02-20 14:26:13 +0100
commitfccddb25e1ec96bd11cd0fc6aa097899a9a8b44b (patch)
treefbd4f4d0f88a6972a7995fa60698766310069035 /Documentation/power
parent58339feae7133f1be6228b7ab56a147712aa0a92 (diff)
parent00bb3998829783157ccf1343abcccd38a604bc64 (diff)
downloadlinux-stable-fccddb25e1ec96bd11cd0fc6aa097899a9a8b44b.tar.gz
linux-stable-fccddb25e1ec96bd11cd0fc6aa097899a9a8b44b.tar.bz2
linux-stable-fccddb25e1ec96bd11cd0fc6aa097899a9a8b44b.zip
Merge branch 'pm-sleep'
* pm-sleep: PM / Documentation: Spelling s/wrtie/write/ PM / sleep: Fix test_suspend after sleep state rework PM / Hibernate: Use rb_entry() instead of container_of()
Diffstat (limited to 'Documentation/power')
-rw-r--r--Documentation/power/states.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/power/states.txt b/Documentation/power/states.txt
index 008ecb588317..bc4548245a24 100644
--- a/Documentation/power/states.txt
+++ b/Documentation/power/states.txt
@@ -25,7 +25,7 @@ to be used subsequently to change to the one represented by that string.
Consequently, there are two ways to cause the system to go into the
Suspend-To-Idle sleep state. The first one is to write "freeze" directly to
/sys/power/state. The second one is to write "s2idle" to /sys/power/mem_sleep
-and then to wrtie "mem" to /sys/power/state. Similarly, there are two ways
+and then to write "mem" to /sys/power/state. Similarly, there are two ways
to cause the system to go into the Power-On Suspend sleep state (the strings to
write to the control files in that case are "standby" or "shallow" and "mem",
respectively) if that state is supported by the platform. In turn, there is