Merge branch 'tmp'

diff --cc drivers/scsi/libata-core.c
index 50fb7cea94eb193d029e751a3f9949b43d60f71b,93ae2dcc837c183c41f367ad3c1c9d8688a169d6..c67c7a49c8bab2b9fcdb40823db9891afc38a85e
--- 1/drivers/scsi/libata-core.c
--- 2/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -3662,11 -3470,8 +3654,10 @@@ static void ata_qc_timeout(struct ata_q
                printk(KERN_ERR "ata%u: command 0x%x timeout, stat 0x%x host_stat 0x%x\n",
                       ap->id, qc->tf.command, drv_stat, host_stat);
  
 +              ap->hsm_task_state = HSM_ST_IDLE;
 +
                /* complete taskfile transaction */
                qc->err_mask |= ac_err_mask(drv_stat);
-               ata_qc_complete(qc);
                break;
        }
  
@@@ -4705,7 -4413,9 +4698,8 @@@ static void ata_host_init(struct ata_po
        ap->active_tag = ATA_TAG_POISON;
        ap->last_ctl = 0xFF;
  
 -      INIT_WORK(&ap->packet_task, atapi_packet_task, ap);
        INIT_WORK(&ap->pio_task, ata_pio_task, ap);
+       INIT_LIST_HEAD(&ap->eh_done_q);
  
        for (i = 0; i < ATA_MAX_DEVICES; i++)
                ap->device[i].devno = i;

diff --cc drivers/scsi/sata_mv.c
Simple merge

diff --cc drivers/scsi/sata_promise.c
Simple merge

diff --cc drivers/scsi/sata_sx4.c
Simple merge

diff --cc include/linux/libata.h
Simple merge