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

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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 40cc653984ee7b5cc13d7fc105fdd3ae744fd2e6..a70e43edcb65c9d732d3877499410b487911d213 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2526,6 +2526,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        <port#>,<js1>,<js2>,<js3>,<js4>,<js5>,<js6>,<js7>
                        See also Documentation/input/joystick-parport.txt
 
+       udbg-immortal   [PPC] When debugging early kernel crashes that
+                       happen after console_init() and before a proper 
+                       console driver takes over, this boot options might
+                       help "seeing" what's going on.
+
        uhash_entries=  [KNL,NET]
                        Set number of hash buckets for UDP/UDP-Lite connections
 
@@ -2540,6 +2545,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        unknown_nmi_panic
                        [X86] Cause panic on unknown NMI.
 
+       usbcore.authorized_default=
+                       [USB] Default USB device authorization:
+                       (default -1 = authorized except for wireless USB,
+                       0 = not authorized, 1 = authorized)
+
        usbcore.autosuspend=
                        [USB] The autosuspend time delay (in seconds) used
                        for newly-detected USB devices (default 2).  This