]> err.no Git - linux-2.6/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 21 Sep 2007 16:52:20 +0000 (09:52 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 21 Sep 2007 16:52:20 +0000 (09:52 -0700)
commit73e83dc300d5f2858c1e3f6bf7fbb1e161a2990c
treefb2df8f427a7578c522aead5e57e27be78ea125e
parent176df2457ef6207156ca1a40991c54ca01fef567
parent813d974c53a2b353566a86bb127625b403696dae
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