Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 17 Jan 2006 15:29:06 +0000 (10:29 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 17 Jan 2006 15:29:06 +0000 (10:29 -0500)
commitea9b395fe20ac74be788f415af2622ac8f0c35c7
treed1653e1a4cbe360aa7132ea4e29ab92a02038224
parent61420e147a706ee7c7a902008045547fb2a2a330
parent1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9
Merge branch 'upstream'
drivers/scsi/libata-core.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_nv.c
drivers/scsi/sata_promise.c
drivers/scsi/sata_sx4.c
drivers/scsi/sata_vsc.c
include/linux/ata.h
include/linux/libata.h