]> git.neil.brown.name Git - history.git/commitdiff
Merge pobox.com:/garz/repo/libata-dev/export-simulator
authorJeff Garzik <jgarzik@pobox.com>
Thu, 21 Oct 2004 19:58:05 +0000 (15:58 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 21 Oct 2004 19:58:05 +0000 (15:58 -0400)
into pobox.com:/garz/repo/libata-2.6

1  2 
drivers/scsi/sata_sil.c

Simple merge