Merge branch 'master'

diff --cc drivers/scsi/libata-core.c
index 61cba39a683446d66e968853f217eab6d6015860,7ddd5a69352a847f4d957e65a06dd95830baa199..adc5b440c9bc0bb406ca825a60421f22574ff87a
--- 1/drivers/scsi/libata-core.c
--- 2/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -3426,11 -3357,12 +3426,12 @@@ static void ata_pio_error(struct ata_po
  {
        struct ata_queued_cmd *qc;
  
-       printk(KERN_WARNING "ata%u: PIO error\n", ap->id);
- 
        qc = ata_qc_from_tag(ap, ap->active_tag);
 -      assert(qc != NULL);
 +      WARN_ON(qc == NULL);
  
+       if (qc->tf.command != ATA_CMD_PACKET)
+               printk(KERN_WARNING "ata%u: PIO error\n", ap->id);
+ 
        /* make sure qc->err_mask is available to 
         * know what's wrong and recover
         */

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

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