Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 29 Oct 2005 21:49:12 +0000 (17:49 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 29 Oct 2005 21:49:12 +0000 (17:49 -0400)
commitb0c4e148bd591629749d02a8fbc8d81c26d548cf
tree3e2142635f3dc2ceeae870ead2dceab7b9c6def1
parent5615ca7906aefbdc3318604c89db5931d0a25910
parentbe15cd72d256e5eb3261a781b8507fac83ab33f6
Merge branch 'master'
drivers/scsi/libata-core.c
drivers/scsi/pdc_adma.c
drivers/scsi/sata_qstor.c
drivers/scsi/sata_sil24.c