]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1295278 5c3e985)
Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 4 Aug 2006 16:56:40 +0000 (09:56 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 4 Aug 2006 16:56:40 +0000 (09:56 -0700)
* 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6:
  SUNRPC: Fix obvious refcounting bugs in rpc_pipefs.
  RPC: Ensure that we disconnect TCP socket when client requests error out
  NLM/lockd: remove b_done
  NFS: make 2 functions static
  NFS: Release dcache_lock in an error path of nfs_path


Trivial merge
Linux 2.6 source tree