From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Apr 2008 18:45:40 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v2.6.26-rc1~1074
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cf2ec150fc5f59dbf2260863225c79aa0cfc46af;p=karo-tx-linux.git

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

* 'for-linus' of git://linux-nfs.org/~bfields/linux:
  nfsd: don't allow setting ctime over v4
  Update to NFS/RDMA documentation
  locks: don't call ->copy_lock methods on return of conflicting locks
  lockd: unlock lockd locks held for a certain filesystem
  lockd: unlock lockd locks associated with a given server ip
  leases: remove unneeded variable from fcntl_setlease().
  leases: move lock allocation earlier in generic_setlease()
  leases: when unlocking, skip locking-related steps
  leases: fix a return-value mixup
---

cf2ec150fc5f59dbf2260863225c79aa0cfc46af