| commit | 2433c41789d6aa6797ca747707b7764e88e4fb6d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 03 16:40:37 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 03 16:40:37 2008 -0800 |
| tree | a4f1706a1038bb8df671807c9ead0fa6abf9b4ed | |
| parent | cd92a17eec752f8c948c4b6ab93dc099ce55b8cb [diff] | |
| parent | a8d82d9b950213b66b22c9e7c63a058841de2394 [diff] |
Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux * 'for-2.6.28' of git://linux-nfs.org/~bfields/linux: NLM: client-side nlm_lookup_host() should avoid matching on srcaddr nfsd: use of unitialized list head on error exit in nfs4recover.c Add a reference to sunrpc in svc_addsock nfsd: clean up grace period on early exit