Merge branch 'mv-merge'

Conflicts:

	drivers/scsi/sata_mv.c

diff --cc drivers/scsi/sata_mv.c
index 275ed9bd898cae8a0d1d25d5d47b7a077715179f,33e3873543882888f13483b7f7a6c443144342e7..fa901fd650856e8f7b241ff5285bcc3ab84c4c6e
--- 1/drivers/scsi/sata_mv.c
--- 2/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@@ -1372,8 -1209,8 +1371,10 @@@ static void mv_host_intr(struct ata_hos
                hc,relevant,hc_irq_cause);
  
        for (port = port0; port < port0 + MV_PORTS_PER_HC; port++) {
-               ap = host_set->ports[port];
 +              u8 ata_status = 0;
+               struct ata_port *ap = host_set->ports[port];
+               struct mv_port_priv *pp = ap->private_data;
++
                hard_port = port & MV_PORT_MASK;        /* range 0-3 */
                handled = 0;    /* ensure ata_status is set if handled++ */