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)
commitf25f60beea574d7cff65680694a909e58c5c81c1
tree0fbfa6a66cb67a995e2a98ffcdfa7df63f17c01e
parentd7757be133cc05620608af46acd178686681b7ef
parent36dd2fdb37efdab15844eb72026f8ce3aa0fb560
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