Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Dec 2008 00:40:37 +0000 (16:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Dec 2008 00:40:37 +0000 (16:40 -0800)
commit2433c41789d6aa6797ca747707b7764e88e4fb6d
treea4f1706a1038bb8df671807c9ead0fa6abf9b4ed
parentcd92a17eec752f8c948c4b6ab93dc099ce55b8cb
parenta8d82d9b950213b66b22c9e7c63a058841de2394
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