tree 8b3d6902494dcf3d872ce7e47ebe38846f0d8895
parent 7111de76438e05ceab8ba2a471192fa3ea6c3572
parent e535e2efd295c3990bb9f654c8bb6bd176ebdc2b
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1189556596 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1189556596 -0700

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