commit a531a141089714efe39eca89593524fdf05104f2
author Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Nov 27 18:54:17 2007 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Nov 27 18:54:17 2007 -0800
tree f858a5d7c11f5da8d00473ed7b176540e2243bdf
parent 5e6ddf9aaa0f2b16fc503626c70bb19832b22b8b
parent b1967d0eddeef4869ee283e692735cb994f3745a

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: reverse inline-data truncate args
  ocfs2: Fix comparison in ocfs2_size_fits_inline_data()
  ocfs2: Remove bug statement in ocfs2_dentry_iput()
  [PATCH] ocfs2: Remove expensive bitmap scanning
  ocfs2: log valid inode # on bad inode
  ocfs2: Filter -ENOSPC in mlog_errno()
  [PATCH] fs/ocfs2: Add missing "space"
  ocfs2: Reset journal parameters after s_mount_opt update