Merge branch 'tj-upstream-pci_register_driver' of git://htj.dyndns.org/libata-tj...
authorJeff Garzik <jeff@garzik.org>
Thu, 10 Aug 2006 10:56:51 +0000 (06:56 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 10 Aug 2006 10:56:51 +0000 (06:56 -0400)
1  2 
drivers/scsi/pdc_adma.c
drivers/scsi/sata_sil.c

Simple merge
Simple merge