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)
commit79ed35a9f139ad2b2653dfdd5f45a8f1453e2cbb
tree1f97c3bfd3ae9995a1e396c5a6c02bf5a346b55c
parent6a2e42ad0f7ac0f4093b96ed0c6744f09bdfce1d
parentb7887196e38da54ff893897b80875d632d1a1114
Merge branch 'tj-upstream-pci_register_driver' of git://htj.dyndns.org/libata-tj into upstream
drivers/scsi/pdc_adma.c
drivers/scsi/sata_sil.c