commit | 843c04a0f63c74c6424e4b7d1ab85223b1ecf740 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 27 16:07:44 2009 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 27 16:07:44 2009 -0800 |
tree | c7f6b771ccc47a249b3c607471b3fbd1ad7ab7d2 | |
parent | b00ecabf1d00f6c164aee62703df5dae7ac79894 [diff] | |
parent | fa82a491275a613b15489aab4b99acecb00958d3 [diff] |
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