Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  nfs[23] tcp breakage in mount with binary options
  net: fix htmldocs sunrpc, clnt.c
This commit is contained in:
Linus Torvalds 2009-09-24 17:06:16 -07:00
commit f25f60beea
2 changed files with 5 additions and 2 deletions