tree 47f335f6faaca36eed1dceb64dc0366ef68ec875
parent 5f789cd8bae9b6315b7bf93e24ec1ac85f5a13b9
parent 98779be861a05c4cb75bed916df72ec0cba8b53d
author Linus Torvalds <torvalds@linux-foundation.org> 1243612149 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1243612149 -0700

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