]> git.hungrycats.org Git - linux/commit
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)
commite270e1b2aeee9e54427e6e13863cd07c688c8f6a
tree82ff0e717384b998677a663e16227b6af3cb316d
parent4b8cbbf6cf087c8389d601a841e73d07099a6367
parentc045ebb7a4d2a55115991a53219f1fc7aec8a6bb
Merge titanic.il.steeleye.com:/home/jejb/BK/scsi-target-2.6
into titanic.il.steeleye.com:/home/jejb/BK/scsi-for-linus-2.6
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/scsi_scan.c