]> git.neil.brown.name Git - history.git/commitdiff
Merge jet.(none):/home1/jejb/BK/scsi-misc-2.5
authorJames Bottomley <jejb@jet.(none)>
Sun, 29 Jun 2003 17:43:18 +0000 (12:43 -0500)
committerJames Bottomley <jejb@jet.(none)>
Sun, 29 Jun 2003 17:43:18 +0000 (12:43 -0500)
into jet.(none):/home1/jejb/BK/scsi-for-linus-2.5

1  2 
drivers/scsi/Kconfig
drivers/scsi/sr.c

Simple merge
Simple merge