diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-25 07:43:04 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-25 07:43:04 +0200 |
| commit | 314820c9e892d8f41ba4db300ec96770d9c8294b (patch) | |
| tree | 3d5c59a429239b180c77e57f998a78d3f2b79827 /Documentation/power/suspend-and-cpuhotplug.txt | |
| parent | Input: xpad - add Andamiro Pump It Up pad (diff) | |
| parent | Input: add MELFAS mms114 touchscreen driver (diff) | |
| download | linux-314820c9e892d8f41ba4db300ec96770d9c8294b.tar.xz linux-314820c9e892d8f41ba4db300ec96770d9c8294b.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'Documentation/power/suspend-and-cpuhotplug.txt')
| -rw-r--r-- | Documentation/power/suspend-and-cpuhotplug.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/power/suspend-and-cpuhotplug.txt b/Documentation/power/suspend-and-cpuhotplug.txt index f28f9a6f0347..e13dafc8e8f1 100644 --- a/Documentation/power/suspend-and-cpuhotplug.txt +++ b/Documentation/power/suspend-and-cpuhotplug.txt @@ -29,7 +29,7 @@ More details follow: Write 'mem' to /sys/power/state - syfs file + sysfs file | v Acquire pm_mutex lock |