Merge branch 'for-linus' of git://www.jni.nu/cris

[firefly-linux-kernel-4.4.55.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index e9261e938f6ab8657586f6c068be1766bd725667..c357a31411cdb98978153eb5de0ecb2db025648f 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -872,6 +872,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                               If specified, z/VM IUCV HVC accepts connections
                               from listed z/VM user IDs only.
 
+       keep_bootcon    [KNL]
+                       Do not unregister boot console at start. This is only
+                       useful for debugging when something happens in the window
+                       between unregistering the boot console and initializing
+                       the real console.
+
        i2c_bus=        [HW] Override the default board specific I2C bus speed
                             or register an additional I2C bus that is not
                             registered from board initialization code.