From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Sep 2009 00:06:16 +0000 (-0700)
Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Tag: v3.0~7381
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f25f60beea574d7cff65680694a909e58c5c81c1;p=platform%2Fkernel%2Flinux-amlogic.git

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
---

f25f60beea574d7cff65680694a909e58c5c81c1