Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 19 Oct 2007 21:31:42 +0000 (14:31 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 19 Oct 2007 21:31:42 +0000 (14:31 -0700)
commitb04cde34cf1d006dfaf8523640f3a18bbb15ebaa
treea811f7a6db0de11f6c412548dfe081a57aba0451
parent4800be295c34268fd3211d49828bfaa6bf62867f
parent603c83da19cf42d0f94022ac2fa389a431e32b84
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

* git://git.linux-nfs.org/pub/linux/nfs-2.6:
  NFSv4: Fix an rpc_cred reference leakage in fs/nfs/delegation.c
  NFSv4: Ensure that we wait for the CLOSE request to complete
  NFS: Fix a race in sillyrename
  NFS: Fix a writeback race...