tree a4f1706a1038bb8df671807c9ead0fa6abf9b4ed
parent cd92a17eec752f8c948c4b6ab93dc099ce55b8cb
parent a8d82d9b950213b66b22c9e7c63a058841de2394
author Linus Torvalds <torvalds@linux-foundation.org> 1228351237 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228351237 -0800

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