From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 17 Dec 2007 21:36:17 +0000 (-0800)
Subject: Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
X-Git-Tag: v2.6.24-rc6~56
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2cc3a8f6ac0fb1e6095a47001d31aadcf9722bde;p=linux-2.6-omap-h63xx.git

Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

* git://git.linux-nfs.org/pub/linux/nfs-2.6:
  MAINTAINERS: update the NFS CLIENT entry
  NFS: Fix an Oops in NFS unmount
  Revert "NFS: Ensure we return zero if applications attempt to write zero bytes"
  SUNRPC xprtrdma: fix XDR tail buf marshalling for all ops
  NFSv2/v3: Fix a memory leak when using -onolock
  NFS: Fix NFS mountpoint crossing...
---

2cc3a8f6ac0fb1e6095a47001d31aadcf9722bde