]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7111de7 e535e2e)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 12 Sep 2007 00:23:16 +0000 (17:23 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 12 Sep 2007 00:23:16 +0000 (17:23 -0700)
commit577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d
tree8b3d6902494dcf3d872ce7e47ebe38846f0d8895tree | snapshot
parent7111de76438e05ceab8ba2a471192fa3ea6c3572commit | diff
parente535e2efd295c3990bb9f654c8bb6bd176ebdc2bcommit | 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: 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
Linux 2.6 source tree