Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 21:36:00 +0000 (13:36 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 21:36:00 +0000 (13:36 -0800)
commit23afc5c67588c92a062b4828a97b119755dffb51
tree637cdaf8e1a64075840026ee080ebb68cec5289e
parent13ef7b69b54aa8ae4ed264d0bf41339737f8543a
parente8aed3450c0afd6fdb79ec233f806e3e69454dfe
Merge branch 'upstream-linus' of git://git./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()