Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 06e362b2d5b8bb7321cac022685bba04e9c81da7..0dc848bf0b56bb59b0c69eacfc3fb4d6a593fb7c 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -910,6 +910,14 @@ running once the system is up.
        nfsroot=        [NFS] nfs root filesystem for disk-less boxes.
                        See Documentation/nfsroot.txt.
 
+       nfs.callback_tcpport=
+                       [NFS] set the TCP port on which the NFSv4 callback
+                       channel should listen.
+
+       nfs.idmap_cache_timeout=
+                       [NFS] set the maximum lifetime for idmapper cache
+                       entries.
+
        nmi_watchdog=   [KNL,BUGS=IA-32] Debugging features for SMP kernels
 
        no387           [BUGS=IA-32] Tells the kernel to use the 387 maths
@@ -990,6 +998,8 @@ running once the system is up.
 
        nowb            [ARM]
 
+       nr_uarts=       [SERIAL] maximum number of UARTs to be registered.
+
        opl3=           [HW,OSS]
                        Format: <io>