From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 4 Aug 2006 16:56:40 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
X-Git-Tag: v2.6.18-rc4~44
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3b445eeac4f292aeb14df50b272729d0924da937;p=linux-2.6-omap-h63xx.git

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

3b445eeac4f292aeb14df50b272729d0924da937