Merge tag 'docs-4.12-2' of git://git.lwn.net/linux

[mirror_ubuntu-artful-kernel.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 4e0654b56aefad77c4f84c64d7e140b58df86fb3..15f79c27748df1611b1643b77ca68e2a5e7cfaab 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -972,7 +972,7 @@
                        A valid base address must be provided, and the serial
                        port must already be setup and configured.
 
-               armada3700_uart,<addr>
+               ar3700_uart,<addr>
                        Start an early, polled-mode console on the
                        Armada 3700 serial port at the specified
                        address. The serial port must already be setup
@@ -2434,12 +2434,6 @@
                        and gids from such clients.  This is intended to ease
                        migration from NFSv2/v3.
 
-       objlayoutdriver.osd_login_prog=
-                       [NFS] [OBJLAYOUT] sets the pathname to the program which
-                       is used to automatically discover and login into new
-                       osd-targets. Please see:
-                       Documentation/filesystems/pnfs.txt for more explanations
-
        nmi_debug=      [KNL,SH] Specify one or more actions to take
                        when a NMI is triggered.
                        Format: [state][,regs][,debounce][,die]