Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[pandora-kernel.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 0bf8a88..ad38006 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -491,6 +491,13 @@ and is between 256 and 4096 characters. It is defined in the file
                        Also note the kernel might malfunction if you disable
                        some critical bits.
 
+       cmo_free_hint=  [PPC] Format: { yes | no }
+                       Specify whether pages are marked as being inactive
+                       when they are freed.  This is used in CMO environments
+                       to determine OS memory pressure for page stealing by
+                       a hypervisor.
+                       Default: yes
+
        code_bytes      [X86] How many bytes of object code to print
                        in an oops report.
                        Range: 0 - 8192
@@ -1073,7 +1080,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
        kgdboc=         [HW] kgdb over consoles.
                        Requires a tty driver that supports console polling.
-                       (only serial suported for now)
+                       (only serial supported for now)
                        Format: <serial_device>[,baud]
 
        kmac=           [MIPS] korina ethernet MAC address.
@@ -1402,7 +1409,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        ('y', default) or cooked coordinates ('n')
 
        mtrr_chunk_size=nn[KMG] [X86]
-                       used for mtrr cleanup. It is largest continous chunk
+                       used for mtrr cleanup. It is largest continuous chunk
                        that could hold holes aka. UC entries.
 
        mtrr_gran_size=nn[KMG] [X86]