]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b8cbbf c045ebb)
Merge titanic.il.steeleye.com:/home/jejb/BK/scsi-target-2.6
authorJames Bottomley <jejb@titanic.il.steeleye.com>
Mon, 18 Oct 2004 11:48:22 +0000 (06:48 -0500)
committerJames Bottomley <jejb@titanic.il.steeleye.com>
Mon, 18 Oct 2004 11:48:22 +0000 (06:48 -0500)
into titanic.il.steeleye.com:/home/jejb/BK/scsi-for-linus-2.6

1  2 
drivers/scsi/qla2xxx/qla_os.c patch | diff1 | diff2 | blob | history
drivers/scsi/scsi_scan.c patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge
diff --cc drivers/scsi/scsi_scan.c
Simple merge
Linux kernels and configurations used by Zygo.