summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/osd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 21:23:52 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 21:23:52 +0200
commitcd5232bd6be2d215a800f3d88c287ca791debfbe (patch)
tree7a91e7d4bc5312cc61e7003abd383d8de1f0f9aa /drivers/scsi/osd
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentjfs: fix regression preventing coalescing of extents (diff)
downloadlinux-cd5232bd6be2d215a800f3d88c287ca791debfbe.tar.xz
linux-cd5232bd6be2d215a800f3d88c287ca791debfbe.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: fix regression preventing coalescing of extents
Diffstat (limited to 'drivers/scsi/osd')
0 files changed, 0 insertions, 0 deletions