| commit | c8bce3d3bdedc7d187fa222a3b36d149bd940d0e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 29 08:49:09 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 29 08:49:09 2009 -0700 |
| tree | 47f335f6faaca36eed1dceb64dc0366ef68ec875 | |
| parent | 5f789cd8bae9b6315b7bf93e24ec1ac85f5a13b9 [diff] | |
| parent | 98779be861a05c4cb75bed916df72ec0cba8b53d [diff] |
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