From b381efbaffdb063b29dab780ae1828b85f03adea Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Sat, 14 Jan 2006 13:21:19 -0800 Subject: [PATCH] --- yaml --- r: 18525 b: refs/heads/master c: a6b25b675db9f9f1af640b928f5476e8454b391c h: refs/heads/master i: 18523: 4b36babafb2540380d67204139d5d774b06ae820 v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b78d3ec9abed..816152f171fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c878967d32a10cb604718f7608efa0ea3d8b596 +refs/heads/master: a6b25b675db9f9f1af640b928f5476e8454b391c diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index fe11fccf7e41..e88e348886f2 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -712,9 +712,17 @@ running once the system is up. load_ramdisk= [RAM] List of ramdisks to load from floppy See Documentation/ramdisk.txt. - lockd.udpport= [NFS] + lockd.nlm_grace_period=P [NFS] Assign grace period. + Format: + + lockd.nlm_tcpport=N [NFS] Assign TCP port. + Format: - lockd.tcpport= [NFS] + lockd.nlm_timeout=T [NFS] Assign timeout value. + Format: + + lockd.nlm_udpport=M [NFS] Assign UDP port. + Format: logibm.irq= [HW,MOUSE] Logitech Bus Mouse Driver Format: