The following commit has been merged in the linux branch: commit fb3165b59f9ce510fed07262db20fdb799f88fa6 Merge: 36f8a53ff2626dbfc3c0a809fe1d2290937ddc96 9a3936aac133037f65124fcb2d676a6c201a90a4 Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 29 09:02:24 2009 -0700
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFSv4: The link() operation should return any delegation on the file NFSv4: Fix two unbalanced put_rpccred() issues. NFSv4: Fix a bug when the server returns NFS4ERR_RESOURCE nfs: Panic when commit fails