Merge branch 'for-2.6.30' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 May 2009 00:11:56 +0000 (17:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 May 2009 00:11:56 +0000 (17:11 -0700)
commit2ea3f868487dcee0bfd91055f1c42bb172efc507
treeab8386aba340269f36c402c59ca77234ac1db7a6
parentbfe3891a5f5d3b78146a45f40e435d14f5ae39dd
parent8daed1e549b55827758b3af7b8132a73fc51526f
Merge branch 'for-2.6.30' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.30' of git://linux-nfs.org/~bfields/linux:
  nfsd: silence lockdep warning
  lockd: fix list corruption on lockd restart
  nfsd4: check for negative dentry before use in nfsv4 readdir
  nfsd41: slots are freed with session
  svcrdma: clean up error paths.
  svcrdma: Fix dma map direction for rdma read targets