]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://linux.bkbits.net/linux-2.5
authorDoug Ledford <dledford@flossy.devel.redhat.com>
Sun, 17 Nov 2002 10:02:31 +0000 (05:02 -0500)
committerDoug Ledford <dledford@flossy.devel.redhat.com>
Sun, 17 Nov 2002 10:02:31 +0000 (05:02 -0500)
into flossy.devel.redhat.com:/usr/local/home/dledford/bk/linus-2.5

1  2 
drivers/scsi/hosts.c

Simple merge