]> err.no Git - linux-2.6/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 28 Nov 2007 02:54:17 +0000 (18:54 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 28 Nov 2007 02:54:17 +0000 (18:54 -0800)
commita531a141089714efe39eca89593524fdf05104f2
treef858a5d7c11f5da8d00473ed7b176540e2243bdf
parent5e6ddf9aaa0f2b16fc503626c70bb19832b22b8b
parentb1967d0eddeef4869ee283e692735cb994f3745a
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