From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Dec 2008 00:40:37 +0000 (-0800)
Subject: Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v2.6.28-rc8~67
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2433c41789d6aa6797ca747707b7764e88e4fb6d;p=linux-2.6-omap-h63xx.git

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
---

2433c41789d6aa6797ca747707b7764e88e4fb6d