libata: Fix EH merge difference between this branch and upstream.
authorJeff Garzik <jeff@garzik.org>
Tue, 11 Apr 2006 17:04:39 +0000 (13:04 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 11 Apr 2006 17:04:39 +0000 (13:04 -0400)
commit381544bba3ae6f2f1004b267da34f840b469033c
treee748d5da19d3fa79bee2ad5b40b44722cdf64184
parent10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1
libata: Fix EH merge difference between this branch and upstream.
drivers/scsi/libata-eh.c
drivers/scsi/libata.h
include/linux/libata.h