From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 May 2009 15:49:09 +0000 (-0700)
Subject: Merge branch 'for-2.6.30' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: firefly_0821_release~14070
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=c8bce3d3bdedc7d187fa222a3b36d149bd940d0e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-2.6.30' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.30' of git://linux-nfs.org/~bfields/linux:
  svcrdma: dma unmap the correct length for the RPCRDMA header page.
  nfsd: Revert "svcrpc: take advantage of tcp autotuning"
  nfsd: fix hung up of nfs client while sync write data to nfs server
---

c8bce3d3bdedc7d187fa222a3b36d149bd940d0e