aboutsummaryrefslogtreecommitdiff
path: root/fs/ocfs2/dlmglue.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-30 11:40:40 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-30 11:40:40 -0800
commit72836708c6218d91db982ae48c5c62293e78ed7c (patch)
tree6d26d3a7a298a5a824ed9d400e66092b50c8f650 /fs/ocfs2/dlmglue.c
parent91f6e54b6e534edbf6208e1c750fff9e0491dfcc (diff)
parent97d552e35d9404df3254e1157df3340e4e2eaedc (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: sbp2: fix bogus dma mapping ieee1394: sbp2: pass REQUEST_SENSE through to the target
Diffstat (limited to 'fs/ocfs2/dlmglue.c')
0 files changed, 0 insertions, 0 deletions