nfs: new subdir Documentation/filesystems/nfs

[safe/jmp/linux-2.6] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index f45d0d8..dab0f04 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -671,7 +671,8 @@ and is between 256 and 4096 characters. It is defined in the file
        earlyprintk=    [X86,SH,BLACKFIN]
                        earlyprintk=vga
                        earlyprintk=serial[,ttySn[,baudrate]]
-                       earlyprintk=dbgp
+                       earlyprintk=ttySn[,baudrate]
+                       earlyprintk=dbgp[debugController#]
 
                        Append ",keep" to not disable it when the real console
                        takes over.
@@ -933,7 +934,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        1 -- enable informational integrity auditing messages.
 
        ima_hash=       [IMA]
-                       Formt: { "sha1" | "md5" }
+                       Format: { "sha1" | "md5" }
                        default: "sha1"
 
        ima_tcb         [IMA]
@@ -1016,7 +1017,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        No delay
 
        ip=             [IP_PNP]
-                       See Documentation/filesystems/nfsroot.txt.
+                       See Documentation/filesystems/nfs/nfsroot.txt.
 
        ip2=            [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards
                        See comment before ip2_setup() in
@@ -1537,10 +1538,10 @@ and is between 256 and 4096 characters. It is defined in the file
                        going to be removed in 2.6.29.
 
        nfsaddrs=       [NFS]
-                       See Documentation/filesystems/nfsroot.txt.
+                       See Documentation/filesystems/nfs/nfsroot.txt.
 
        nfsroot=        [NFS] nfs root filesystem for disk-less boxes.
-                       See Documentation/filesystems/nfsroot.txt.
+                       See Documentation/filesystems/nfs/nfsroot.txt.
 
        nfs.callback_tcpport=
                        [NFS] set the TCP port on which the NFSv4 callback
@@ -1565,7 +1566,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        of returning the full 64-bit number.
                        The default is to return 64-bit inode numbers.
 
-       nmi_debug=      [KNL,AVR32] Specify one or more actions to take
+       nmi_debug=      [KNL,AVR32,SH] Specify one or more actions to take
                        when a NMI is triggered.
                        Format: [state][,regs][,debounce][,die]