Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 9 Oct 2005 13:44:07 +0000 (09:44 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 9 Oct 2005 13:44:07 +0000 (09:44 -0400)
commitf58f8be7f65312f602f7970e7da47a6413e692b0
treef60cc040deebceea1b44082dc713e95687d8527f
parentc71c18576d0d8aa4db876c737c3c597c724cf02f
parente710245bb0f980adfb1dfe850e43761a8117c6be
Merge branch 'upstream'
drivers/scsi/libata-core.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_nv.c
include/linux/libata.h