Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Sep 2009 00:06:16 +0000 (17:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Sep 2009 00:06:16 +0000 (17:06 -0700)
* '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


Trivial merge