]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0a7d1ea 3e4bf5a)
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)
commit4d025d1b8fc56987ae69ba5580cbf85a552027b4
tree8b3d6902494dcf3d872ce7e47ebe38846f0d8895tree | snapshot
parent0a7d1ea082b9df8a21efb6185fe723bfa9762cc3commit | diff
parent3e4bf5a967327d23bda5c3770a4c67ecb12287afcommit | 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 Kernel Source Tree.