Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Thu, 23 Mar 2006 00:13:54 +0000 (19:13 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 23 Mar 2006 00:13:54 +0000 (19:13 -0500)
commitf01c18456993bab43067b678f56c87ca954aa43b
tree3e0cd0cdf1a57618202b46a7126125902e3ab832
parent949ec2c8e6b7b89179b85baf6309c009e1a1b951
parent1c2e02750b992703a8a18634e08b04353face243
Merge branch 'master'
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
drivers/scsi/pdc_adma.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_svw.c
drivers/scsi/sata_vsc.c
include/linux/libata.h