diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 18:39:20 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 18:39:20 +0200 |
commit | 52c6738b7f46255217942062dfa60daa7cf72510 (patch) | |
tree | 9fa9fcdef7b44f6d71e5bb5de0e248a368808cc1 /net/appletalk | |
parent | Merge branch 'for-next' of git://git.o-hand.com/linux-mfd (diff) | |
parent | NFS: use correct fs type for v4 submounts and referrals (diff) | |
download | linux-52c6738b7f46255217942062dfa60daa7cf72510.tar.xz linux-52c6738b7f46255217942062dfa60daa7cf72510.zip |
Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFS: use correct fs type for v4 submounts and referrals
Make nfs_file_cred more robust.
NFS: Enable NFSv4 callback server to listen on AF_INET6 sockets
Diffstat (limited to 'net/appletalk')
0 files changed, 0 insertions, 0 deletions