Merge tag 'v3.10.66' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 98da831a14bae92f66411e7f59c17d59f2a33b36..b041a0f3fb986f97d0a381cf99f1b2532b70e259 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3218,6 +3218,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                        HIGHMEM regardless of setting
                                        of CONFIG_HIGHPTE.
 
+       uuid_debug=     (Boolean) whether to enable debugging of TuxOnIce's
+                       uuid support.
+
        vdso=           [X86,SH]
                        vdso=2: enable compat VDSO (default with COMPAT_VDSO)
                        vdso=1: enable VDSO (default)