Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[sfrench/cifs-2.6.git] / Documentation / filesystems / nfs / nfsroot.txt

diff --git a/Documentation/filesystems/nfs/nfsroot.txt b/Documentation/filesystems/nfs/nfsroot.txt
index 3ba0b945aaf862fc1c08a9c1a7f2ea04b0653486..f2430a7974e1655b3cdbb27b79eb801597ac6059 100644 (file)
--- a/Documentation/filesystems/nfs/nfsroot.txt
+++ b/Documentation/filesystems/nfs/nfsroot.txt
@@ -124,6 +124,8 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>
 
   <hostname>   Name of the client. May be supplied by autoconfiguration,
                but its absence will not trigger autoconfiguration.
+               If specified and DHCP is used, the user provided hostname will
+               be carried in the DHCP request to hopefully update DNS record.
 
                Default: Client IP address is used in ASCII notation.