Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
commit2cc3a8f6ac0fb1e6095a47001d31aadcf9722bde
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 21:36:17 +0000 (17 13:36 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 21:36:17 +0000 (17 13:36 -0800)
treeafcc572acff2548cdabdfb0ec488508e1864daf1
parent23afc5c67588c92a062b4828a97b119755dffb51
parent78f5815368837ae7e3a0d3709c9f95f74e4d8537
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...
MAINTAINERS