diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 16:35:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 16:35:11 -0700 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /Documentation/power/swsusp.txt | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'Documentation/power/swsusp.txt')
| -rw-r--r-- | Documentation/power/swsusp.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt index 823b2cf6e3d..9ea2208b43b 100644 --- a/Documentation/power/swsusp.txt +++ b/Documentation/power/swsusp.txt @@ -156,7 +156,7 @@ instead set the PF_NOFREEZE process flag when creating the thread (and be very carefull). -Q: What is the difference between between "platform", "shutdown" and +Q: What is the difference between "platform", "shutdown" and "firmware" in /sys/power/disk? A: @@ -175,8 +175,8 @@ reliable. Q: I do not understand why you have such strong objections to idea of selective suspend. -A: Do selective suspend during runtime power managment, that's okay. But -its useless for suspend-to-disk. (And I do not see how you could use +A: Do selective suspend during runtime power management, that's okay. But +it's useless for suspend-to-disk. (And I do not see how you could use it for suspend-to-ram, I hope you do not want that). Lets see, so you suggest to @@ -211,7 +211,7 @@ slowness may not matter to you. It can always be fixed later. For devices like disk it does matter, you do not want to spindown for FREEZE. -Q: After resuming, system is paging heavilly, leading to very bad interactivity. +Q: After resuming, system is paging heavily, leading to very bad interactivity. A: Try running |