From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 17 Dec 2007 21:36:00 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... 
X-Git-Tag: v2.6.24-rc6~57
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=23afc5c67588c92a062b4828a97b119755dffb51;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: Re-journal buffers after transaction extend
  ocfs2: Allow for debugging of transaction extends
  ocfs2: Don't panic when truncating an empty extent
  ocfs2: fix exit-while-locked bug in ocfs2_queue_orphans()
---

23afc5c67588c92a062b4828a97b119755dffb51