diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 11:45:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 11:45:40 -0700 |
| commit | cf2ec150fc5f59dbf2260863225c79aa0cfc46af (patch) | |
| tree | bd55070b0bc2f8597c35b575374bd0cd2f2d14d6 /arch/sparc | |
| parent | 9f4def9ae4772ea3da5e2359de698742ebae53b5 (diff) | |
| parent | e36cd4a2873c398ba188f16e4087cce7f00a1506 (diff) | |
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
Diffstat (limited to 'arch/sparc')
0 files changed, 0 insertions, 0 deletions