Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Oct 2008 16:39:20 +0000 (09:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Oct 2008 16:39:20 +0000 (09:39 -0700)
commit52c6738b7f46255217942062dfa60daa7cf72510
tree9fa9fcdef7b44f6d71e5bb5de0e248a368808cc1
parent3b72e4415438538c0967fd1aee930f688ccdf6dd
parentec9a05c94c7cd00b4f0ab126c3d394f2fc2e4712
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