From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 6 Feb 2007 22:59:27 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... 
X-Git-Tag: v2.6.21-rc2~42^2~17
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dda2ac15d23b38e4335e858848aa8c9a6710304f;p=linux-2.6-omap-h63xx.git

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: ocfs2_link() journal credits update
---

dda2ac15d23b38e4335e858848aa8c9a6710304f