Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 20 Feb 2006 21:55:56 +0000 (16:55 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 20 Feb 2006 21:55:56 +0000 (16:55 -0500)
commitf131883e73a8662dc92c3ea371ae9ded0c8f2c37
treeacd45903e321cf04df825da8d05ee06dabc1d8aa
parentccbe6d5ee0eb3182675ef1c84322810fd884586d
parent2e242fa994428bd1a40b6a7e97430413246d0a16
Merge branch 'upstream-fixes'
drivers/scsi/libata-core.c
drivers/scsi/sata_qstor.c
include/linux/libata.h