summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx/ql6312.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 02:31:27 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 02:31:27 +0200
commit0481990b758628e12f4b0a9e15094e70cefc7cd1 (patch)
tree67a4b4b7acc6a688b87ef2a2d3ec0e296e6e480c /drivers/scsi/qla2xxx/ql6312.c
parentMerge branch 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airli... (diff)
parentMerge by hand (conflicts in sd.c) (diff)
downloadlinux-0481990b758628e12f4b0a9e15094e70cefc7cd1.tar.xz
linux-0481990b758628e12f4b0a9e15094e70cefc7cd1.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/qla2xxx/ql6312.c')
0 files changed, 0 insertions, 0 deletions