Merge branches 'release' and 'hwmon-conflicts' into release

[linux-2.6] / Documentation / power / tricks.txt

diff --git a/Documentation/power/tricks.txt b/Documentation/power/tricks.txt
index c6d58d3da133f2db8df7ae7802d2af25822b7493..3b26bb502a4a608d54f5fd7940d376e231f2fb4e 100644 (file)
--- a/Documentation/power/tricks.txt
+++ b/Documentation/power/tricks.txt
@@ -9,7 +9,7 @@ If you want to trick swsusp/S3 into working, you might want to try:
 
 * turn off APIC and preempt
 
-* use ext2. At least it has working fsck. [If something seemes to go
+* use ext2. At least it has working fsck. [If something seems to go
   wrong, force fsck when you have a chance]
 
 * turn off modules