diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-31 15:44:08 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-31 15:44:08 -0700 |
commit | e06f42d6c127883e58b747048752f44ae208ae47 (patch) | |
tree | 16b28e067eb7a85259d8a2025fb9256fda55bdc5 /drivers/ieee1394 | |
parent | f891caf28febf9d4129716e848227148654b5993 (diff) | |
parent | d7dc61d0a70371b1c6557ea8ffbc60fff94c8168 (diff) |
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
Diffstat (limited to 'drivers/ieee1394')
0 files changed, 0 insertions, 0 deletions