commit | fb3165b59f9ce510fed07262db20fdb799f88fa6 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 29 09:02:24 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 29 09:02:24 2009 -0700 |
tree | b71c9798f79d12a49ee58e059112b3479c15a816 | |
parent | 36f8a53ff2626dbfc3c0a809fe1d2290937ddc96 [diff] | |
parent | 9a3936aac133037f65124fcb2d676a6c201a90a4 [diff] |
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