Merge branch 'chromeos-verity-3.4' into chromeos-3.4

[cascardo/linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index ca20201..8eb7152 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -595,6 +595,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        a memory unit (amount[KMG]). See also
                        Documentation/kdump/kdump.txt for an example.
 
+       cros_shared_mem=[ARM]
+                       Format: <hex integer>
+                       Base address of the ChromeOS shared memory window,
+                       aligned at megabyte boundary, window size is fixed at
+                       1 megabyte.
+
        cs89x0_dma=     [HW,NET]
                        Format: <dma>