diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 19:34:24 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 19:34:24 (GMT) |
| commit | 2d56d3c43cc97ae48586745556f5a5b564d61582 (patch) | |
| tree | 28f2edc1e69b79e94d99023041dd0358861b6956 /drivers/bluetooth | |
| parent | 0f9008ef38d5a6305d94bbdd8f20d68fc75c63b6 (diff) | |
| parent | 586759f03e2e9031ac5589912a51a909ed53c30a (diff) | |
| download | linux-fsl-qoriq-2d56d3c43cc97ae48586745556f5a5b564d61582.tar.xz | |
Merge branch 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux
* 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux:
gfs2: nfs lock support for gfs2
lockd: add code to handle deferred lock requests
lockd: always preallocate block in nlmsvc_lock()
lockd: handle test_lock deferrals
lockd: pass cookie in nlmsvc_testlock
lockd: handle fl_grant callbacks
lockd: save lock state on deferral
locks: add fl_grant callback for asynchronous lock return
nfsd4: Convert NFSv4 to new lock interface
locks: add lock cancel command
locks: allow {vfs,posix}_lock_file to return conflicting lock
locks: factor out generic/filesystem switch from setlock code
locks: factor out generic/filesystem switch from test_lock
locks: give posix_test_lock same interface as ->lock
locks: make ->lock release private data before returning in GETLK case
locks: create posix-to-flock helper functions
locks: trivial removal of unnecessary parentheses
Diffstat (limited to 'drivers/bluetooth')
0 files changed, 0 insertions, 0 deletions