From: Linus Torvalds Date: Wed, 12 Sep 2007 00:23:16 +0000 (-0700) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... X-Git-Tag: v2.6.23-rc7~67 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d;p=linux.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: Fix calculation of i_blocks during truncate [PATCH] ocfs2: Fix a wrong cluster calculation. [PATCH] ocfs2: fix mount option parsing ocfs2: update docs for new features --- 577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d