Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Mon, 3 Apr 2006 00:41:48 +0000 (20:41 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 3 Apr 2006 00:41:48 +0000 (20:41 -0400)
commit7819d64e31a685e35e4819515c84168d0879816e
treedd567398511128d63ac8bc10567279a68e9ddd37
parenta808be8a12d61cdacba350fdce2e448045be8202
parentaf64371ada9452632c349563d688d30d94e918ba
Merge branch 'upstream'
drivers/scsi/pdc_adma.c
drivers/scsi/sata_nv.c
drivers/scsi/sata_promise.c
drivers/scsi/sata_qstor.c
drivers/scsi/sata_sx4.c