Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 09:28:13 +0000 (04:28 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 09:28:13 +0000 (04:28 -0500)
commit99b3738fbf17208ac474420fa6b7e4b0c0c2b9ed
tree6f977546112ccbd617ef40ae38a1ca558d71bce9
parent332b5a52f2f96bc2d13bbe594a430318c0ee4425
parent8a19ac89edbe9b702c10fd2039b8cb2db4644a5f
Merge branch 'upstream'
drivers/scsi/libata-core.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_promise.c
include/linux/libata.h