Merge commit 'linux-pnfs/nfs41-for-2.6.31' into nfsv41-for-2.6.31
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 18 Jun 2009 00:59:58 +0000 (17:59 -0700)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 18 Jun 2009 00:59:58 +0000 (17:59 -0700)
commit301933a0acfdec837fd8b4884093b3f0fff01d8a
tree1f2412a30d710493179b1b3743cf30302872df15
parent3fe0344faf7fdcb158bd5c1a9aec960a8d70c8e8
parent68f3f90133d56e0c38f04f991e662c2b21592b31
Merge commit 'linux-pnfs/nfs41-for-2.6.31' into nfsv41-for-2.6.31
fs/nfs/super.c
net/sunrpc/svc.c
net/sunrpc/xprtsock.c