aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-18 21:27:00 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-18 21:27:00 -0400
commita8dcf12f9e8ba113251c04d602f1695d537fb142 (patch)
tree1b36a19e34a8471e847bfea88dc66ee6683b7b07 /init/main.c
parentd796e641a3eea2109381d6b0af533454f44916fa (diff)
parent6924c55492c904695f13c552c461c2211f4fdd6a (diff)
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
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions