Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 16:30:16 +0000 (12:30 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 16:30:16 +0000 (12:30 -0400)
commit15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83
treee65562d7300ac653207b1e45ec7e5960ddf78fff
parentbe697c3f137c9ed808753bbbc5d7751c6e5303fc
parent5fadd053d9bb4345ec6f405d24db4e7eb49cf81e
Merge branch 'master'
drivers/scsi/libata-core.c
drivers/scsi/pdc_adma.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_nv.c
drivers/scsi/sata_promise.c
drivers/scsi/sata_qstor.c
drivers/scsi/sata_sx4.c
drivers/scsi/sata_vsc.c
include/linux/ata.h
include/linux/libata.h