aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-17 13:36:00 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-17 13:36:00 -0800
commit23afc5c67588c92a062b4828a97b119755dffb51 (patch)
tree637cdaf8e1a64075840026ee080ebb68cec5289e /include/linux
parent13ef7b69b54aa8ae4ed264d0bf41339737f8543a (diff)
parente8aed3450c0afd6fdb79ec233f806e3e69454dfe (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()
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions