From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Oct 2008 16:39:20 +0000 (-0700)
Subject: Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Tag: v2.6.28-rc1~96
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=52c6738b7f46255217942062dfa60daa7cf72510;p=linux-2.6-omap-h63xx.git

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
---

52c6738b7f46255217942062dfa60daa7cf72510