tree 8f301134c8755f77bd09481d5165cd4a91b66ee5
parent 12952784e5271374b7cb926501f51b9649bf5a2b
parent 5c3e985a2c1908aa97221d3806f85ce7e2fbfa88
author Linus Torvalds <torvalds@g5.osdl.org> 1154710600 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1154710600 -0700

Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6

* '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