| commit | 73e83dc300d5f2858c1e3f6bf7fbb1e161a2990c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Sep 21 09:52:20 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Sep 21 09:52:20 2007 -0700 |
| tree | fb2df8f427a7578c522aead5e57e27be78ea125e | |
| parent | 176df2457ef6207156ca1a40991c54ca01fef567 [diff] | |
| parent | 813d974c53a2b353566a86bb127625b403696dae [diff] |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: ocfs2: Pack vote message and response structures ocfs2: Don't double set write parameters ocfs2: Fix pos/len passed to ocfs2_write_cluster ocfs2: Allow smaller allocations during large writes