Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / Documentation / ibm-acpi.txt

diff --git a/Documentation/ibm-acpi.txt b/Documentation/ibm-acpi.txt
index 8b3fd82b2ce712ead5c94b41f82972e58959200e..71aa403452722348f2a1668db3b6b35699e833df 100644 (file)
--- a/Documentation/ibm-acpi.txt
+++ b/Documentation/ibm-acpi.txt
@@ -450,7 +450,7 @@ his laptop (the location of sensors may vary on other models):
 
 No commands can be written to this file.
 
-EXPERIMENTAL: Embedded controller reigster dump -- /proc/acpi/ibm/ecdump
+EXPERIMENTAL: Embedded controller register dump -- /proc/acpi/ibm/ecdump
 ------------------------------------------------------------------------
 
 This feature is marked EXPERIMENTAL because the implementation