]> git.neil.brown.name Git - history.git/commitdiff
projects / history.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6cd7a7d 246756e)
Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 12 Apr 2004 11:27:11 +0000 (04:27 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 12 Apr 2004 11:27:11 +0000 (04:27 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux

1  2 
drivers/scsi/Kconfig patch | diff1 | diff2 | blob | history
drivers/scsi/dpt_i2o.c patch | diff1 | diff2 | blob | history
drivers/scsi/sr.c patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/Kconfig
Simple merge
diff --cc drivers/scsi/dpt_i2o.c
Simple merge
diff --cc drivers/scsi/sr.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.