From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 31 Oct 2008 22:44:08 +0000 (-0700)
Subject: Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v2.6.28-rc3~21
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=e06f42d6c127883e58b747048752f44ae208ae47

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: Set address family before calling nlm_host_rebooted()
  nfsd: fix failure to set eof in readdir in some situations
---

e06f42d6c127883e58b747048752f44ae208ae47