tree 0fbfa6a66cb67a995e2a98ffcdfa7df63f17c01e
parent d7757be133cc05620608af46acd178686681b7ef
parent 36dd2fdb37efdab15844eb72026f8ce3aa0fb560
author Linus Torvalds <torvalds@linux-foundation.org> 1253837176 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253837176 -0700

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