]> git.hungrycats.org Git - linux/commitdiff
Merge redhat.com:/spare/repo/linux-2.5
authorJeff Garzik <jgarzik@redhat.com>
Fri, 12 Mar 2004 08:54:32 +0000 (03:54 -0500)
committerJeff Garzik <jgarzik@redhat.com>
Fri, 12 Mar 2004 08:54:32 +0000 (03:54 -0500)
into redhat.com:/spare/repo/libata-2.5

1  2 
drivers/scsi/Kconfig
drivers/scsi/Makefile

Simple merge
Simple merge