Merge branch 'upstream'

diff --cc drivers/scsi/libata-core.c
Simple merge

diff --cc drivers/scsi/pdc_adma.c
index 1701e31,af99feb..309b205
--- 1/drivers/scsi/pdc_adma.c
--- 2/drivers/scsi/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
@@@ -487,10 -487,10 +487,10 @@@ static inline unsigned int adma_intr_mm
                        if (!pp || pp->state != adma_state_mmio)
                                continue;
                        qc = ata_qc_from_tag(ap, ap->active_tag);
 -                      if (qc && (!(qc->tf.ctl & ATA_NIEN))) {
 +                      if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) {
  
                                /* check main status, clearing INTRQ */
-                               u8 status = ata_chk_status(ap);
+                               u8 status = ata_check_status(ap);
                                if ((status & ATA_BUSY))
                                        continue;
                                DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",

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

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

diff --cc drivers/scsi/sata_qstor.c
index 6e0c749,1aaf330..6317a9a
--- 1/drivers/scsi/sata_qstor.c
--- 2/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@@ -429,10 -430,10 +429,10 @@@ static inline unsigned int qs_intr_mmio
                        if (!pp || pp->state != qs_state_mmio)
                                continue;
                        qc = ata_qc_from_tag(ap, ap->active_tag);
 -                      if (qc && (!(qc->tf.ctl & ATA_NIEN))) {
 +                      if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) {
  
                                /* check main status, clearing INTRQ */
-                               u8 status = ata_chk_status(ap);
+                               u8 status = ata_check_status(ap);
                                if ((status & ATA_BUSY))
                                        continue;
                                DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",

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

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