| commit | 3979491701cfb2aa7477f5baf40553355391418b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 09 14:52:09 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 09 14:52:09 2011 -0800 |
| tree | 4eafd59af4fd75e646598e581abb4d41e030fef2 | |
| parent | 6b684cd5799cd1e691024ca3a688d1cdec9d4824 [diff] | |
| parent | 3ec07aa9522e3d5e9d5ede7bef946756e623a0a0 [diff] |
Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux * 'for-2.6.38' of git://linux-nfs.org/~bfields/linux: nfsd: wrong index used in inner loop nfsd4: fix bad pointer on failure to find delegation NFSD: fix decode_cb_sequence4resok