From: Linus Torvalds Date: Fri, 21 Sep 2007 16:52:20 +0000 (-0700) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=73e83dc300d5f2858c1e3f6bf7fbb1e161a2990c;p=linux-beck.git 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 --- 73e83dc300d5f2858c1e3f6bf7fbb1e161a2990c