Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 13 Dec 2005 06:47:05 +0000 (01:47 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 13 Dec 2005 06:47:05 +0000 (01:47 -0500)
commitd1397f837647d8b6b3c9253a7e713d203f3cbb26
tree0bfe939169987703e63f3624d5dbb38938253760
parent278efe950988e72e2d0cea35059438fc27035d13
parentd00d598ffbba974d9045ba8b95296655fe2162c5
Merge branch 'upstream'
drivers/scsi/libata-core.c
include/linux/libata.h