]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
* '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


Trivial merge