Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 06:58:18 +0000 (01:58 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 06:58:18 +0000 (01:58 -0500)
commitf0612bbc41f65f5a684f69d714a1a17a6f0f40c5
tree8c070070bb355843cfa4635643e9da7c2c4cd44a
parentb0c4e148bd591629749d02a8fbc8d81c26d548cf
parent81cfb8864c73230eb1c37753aba517db15cf4d8f
Merge branch 'upstream'
drivers/scsi/ahci.c
drivers/scsi/libata-core.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_sil24.c
include/linux/libata.h