From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 19 Jul 2007 01:27:00 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a8dcf12f9e8ba113251c04d602f1695d537fb142;p=deliverable%2Flinux.git

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

* 'for-linus' of git://linux-nfs.org/~bfields/linux:
  locks: fix vfs_test_lock() comment
  locks: make posix_test_lock() interface more consistent
  nfs: disable leases over NFS
  gfs2: stop giving out non-cluster-coherent leases
  locks: export setlease to filesystems
  locks: provide a file lease method enabling cluster-coherent leases
  locks: rename lease functions to reflect locks.c conventions
  locks: share more common lease code
  locks: clean up lease_alloc()
  locks: convert an -EINVAL return to a BUG
  leases: minor break_lease() comment clarification
---

a8dcf12f9e8ba113251c04d602f1695d537fb142