Merge branch 'imx/compile-fixes' of git://git.linaro.org/people/shawnguo/linux-2...

[pandora-kernel.git] / Documentation / laptops / thinkpad-acpi.txt

diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index 3ff0dad..9d66682 100644 (file)
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
@@ -411,9 +411,9 @@ event       code    Key             Notes
 
 0x1004 0x03    FN+F4           Sleep button (ACPI sleep button
                                semantics, i.e. sleep-to-RAM).
-                               It is always generate some kind
+                               It always generates some kind
                                of event, either the hot key
-                               event or a ACPI sleep button
+                               event or an ACPI sleep button
                                event. The firmware may
                                refuse to generate further FN+F4
                                key presses until a S3 or S4 ACPI