Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 13 Feb 2006 05:13:48 +0000 (00:13 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 13 Feb 2006 05:13:48 +0000 (00:13 -0500)
commit3875e1945b55f0eb83fe7359614a801eeb716761
tree4567aef3fb7d081cb7d7b7c9bcd94e0e44d39557
parent587005de144acd3007b8e7f2a2a7c6add157c155
parentf1b318793dcd2d9ff6b5ac06e7762098fa079cee
Merge branch 'upstream'
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