From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 28 Jan 2009 00:07:44 +0000 (-0800)
Subject: Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v2.6.29-rc3~7
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=843c04a0f63c74c6424e4b7d1ab85223b1ecf740

Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.29' of git://linux-nfs.org/~bfields/linux:
  nfsd: only set file_lock.fl_lmops in nfsd4_lockt if a stateowner is found
  nfsd: fix cred leak on every rpc
  nfsd: fix null dereference on error path
  nfs: note that CONFIG_SUNRPC_XPRT_RDMA turns on server side support too
  update port number in NFS/RDMA documentation
---

843c04a0f63c74c6424e4b7d1ab85223b1ecf740