Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 20 Feb 2006 10:13:31 +0000 (05:13 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 20 Feb 2006 10:13:31 +0000 (05:13 -0500)
commitff607748590fba14aecedb0d50edc4ada98d4302
tree986e0a3abe922713069a8e8bc913043fed89a39a
parentdb024d5398cd332023896caf70530564b15ec88e
parent6aff8f1f07a7fff48121d1ad4a550f3af24ccc81
Merge branch 'upstream'
drivers/scsi/libata-core.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_vsc.c
include/linux/libata.h