aboutsummaryrefslogtreecommitdiff
path: root/fs/ocfs2/dlm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-03 16:45:56 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-03 16:45:56 -0800
commitfeaf3848a813a106f163013af6fcf6c4bfec92d9 (patch)
treea5b2db24fa361e96efb64442f48e463154a66f8b /fs/ocfs2/dlm
parenta771132783d3f78a51597fdcee96c6dfbae3512e (diff)
parent0e435ac26e3f951d83338ed3d4ab7dc0fe0055bc (diff)
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: fix setting of max_segment_size and seg_boundary mask block: internal dequeue shouldn't start timer block: set disk->node_id before it's being used When block layer fails to map iov, it calls bio_unmap_user to undo
Diffstat (limited to 'fs/ocfs2/dlm')
0 files changed, 0 insertions, 0 deletions