From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 May 2009 00:11:56 +0000 (-0700)
Subject: Merge branch 'for-2.6.30' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v2.6.30-rc6~26
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2ea3f868487dcee0bfd91055f1c42bb172efc507;p=~shefty%2Frdma-dev.git

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

2ea3f868487dcee0bfd91055f1c42bb172efc507