Merge branch 'master' into upstream.

[~andy/linux] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d2b515000e403beb866a98193452e7aa6de04263..cc85a927819070bef71e5802204b0f07cfb76973 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -699,7 +699,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        ekgdboc=        [X86,KGDB] Allow early kernel console debugging
                        ekgdboc=kbd
 
-                       This is desgined to be used in conjunction with
+                       This is designed to be used in conjunction with
                        the boot argument: earlyprintk=vga
 
        edd=            [EDD]