| commit | 23afc5c67588c92a062b4828a97b119755dffb51 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Dec 17 13:36:00 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Dec 17 13:36:00 2007 -0800 |
| tree | 637cdaf8e1a64075840026ee080ebb68cec5289e | |
| parent | 13ef7b69b54aa8ae4ed264d0bf41339737f8543a [diff] | |
| parent | e8aed3450c0afd6fdb79ec233f806e3e69454dfe [diff] |
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()