| commit | e06f42d6c127883e58b747048752f44ae208ae47 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 31 Oct 2008 22:44:08 +0000 (31 15:44 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 31 Oct 2008 22:44:08 +0000 (31 15:44 -0700) | ||
| tree | 16b28e067eb7a85259d8a2025fb9256fda55bdc5 | treesnapshot (tar.gz zip) |
| parent | f891caf28febf9d4129716e848227148654b5993 | commitdiff |
| parent | d7dc61d0a70371b1c6557ea8ffbc60fff94c8168 | commitdiff |
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
* '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