| commit | a0e3390787ef523699ae1f3f3ea0ca953e630be2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 28 15:13:05 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 28 15:13:05 2010 -0700 |
| tree | 0769becdd64b31489be18fdda583e0f38eca146f | |
| parent | 2d3b07c07b39c4b7d9b6641052a02d996cd5d87c [diff] | |
| parent | 12364a4f05295cb1e4a161d36b486c248c11c485 [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: nfs4: The difference of 2 pointers is ptrdiff_t nfs: testing the wrong variable nfs: handle lock context allocation failures in nfs_create_request Fixed Regression in NFS Direct I/O path