diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 12:06:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 12:06:36 -0400 |
| commit | 99dbb1632f1165c2726056ebfce6edde0e5a0208 (patch) | |
| tree | 2b2fc83db20b4c6d13842496899774b0dc2868e2 /Documentation/power | |
| parent | aae6f989c6e97ff8197717fa4d032ad4eba091a7 (diff) | |
| parent | 9c33c512b2d3167a3580659942ee78437b1b1bc6 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull the trivial tree from Jiri Kosina:
"Tiny usual fixes all over the place"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
doc: fix old config name of kprobetrace
fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc
btrfs: fix the commment for the action flags in delayed-ref.h
btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID
vfs: fix kerneldoc for generic_fh_to_parent()
treewide: fix comment/printk/variable typos
ipr: fix small coding style issues
doc: fix broken utf8 encoding
nfs: comment fix
platform/x86: fix asus_laptop.wled_type module parameter
mfd: printk/comment fixes
doc: getdelays.c: remember to close() socket on error in create_nl_socket()
doc: aliasing-test: close fd on write error
mmc: fix comment typos
dma: fix comments
spi: fix comment/printk typos in spi
Coccinelle: fix typo in memdup_user.cocci
tmiofb: missing NULL pointer checks
tools: perf: Fix typo in tools/perf
tools/testing: fix comment / output typos
...
Diffstat (limited to 'Documentation/power')
| -rw-r--r-- | Documentation/power/swsusp.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt index 92341b84250d..0b4b63e7e9b6 100644 --- a/Documentation/power/swsusp.txt +++ b/Documentation/power/swsusp.txt | |||
| @@ -53,7 +53,7 @@ before suspend (it is limited to 500 MB by default). | |||
| 53 | 53 | ||
| 54 | Article about goals and implementation of Software Suspend for Linux | 54 | Article about goals and implementation of Software Suspend for Linux |
| 55 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 55 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 56 | Author: Gábor Kuti | 56 | Author: Gábor Kuti |
| 57 | Last revised: 2003-10-20 by Pavel Machek | 57 | Last revised: 2003-10-20 by Pavel Machek |
| 58 | 58 | ||
| 59 | Idea and goals to achieve | 59 | Idea and goals to achieve |