| commit | ade61088bc77dd209f8edadbe544f1e5dad6c287 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 27 10:18:44 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 27 10:18:44 2010 -0700 |
| tree | 50a2eb0b78a470f379801a5abc73ff822f1e47c0 | |
| parent | 7eb1053fd00a8f0e2263697638e17da8a251aa74 [diff] | |
| parent | 0522f6adedd2736cbca3c0e16ca51df668993eee [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: NFS: Fix another nfs_wb_page() deadlock NFS: Ensure that we mark the inode as dirty if we exit early from commit NFS: Fix a lock imbalance typo in nfs_access_cache_shrinker sunrpc: fix leak on error on socket xprt setup