Please do a bk pull bk://kernel.bkbits.net/jgarzik/libata-upstream-2.4 This will update the following files: drivers/scsi/libata-core.c | 9 ++++----- drivers/scsi/sata_nv.c | 6 ++++-- drivers/scsi/sata_qstor.c | 30 ++++++++++++++++++++++++------ drivers/scsi/sata_sil.c | 2 +- drivers/scsi/sata_svw.c | 4 ++-- drivers/scsi/sata_vsc.c | 3 ++- 6 files changed, 37 insertions(+), 17 deletions(-) through these ChangeSets: : o sata_qstor: eh_timeout fix Adrian Bunk: o drivers/scsi/sata_*: make code static Jeff Garzik: o [libata] remove_one helper cleanup