Merge branch 'upstream'

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

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

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

diff --cc include/linux/libata.h
index 3ab6762,7929cfc..0f89f41
--- 1/include/linux/libata.h
--- 2/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -154,21 -155,21 +155,25 @@@ enum 
        ATA_SHIFT_UDMA          = 0,
        ATA_SHIFT_MWDMA         = 8,
        ATA_SHIFT_PIO           = 11,
 +
 +      /* size of buffer to pad xfers ending on unaligned boundaries */
 +      ATA_DMA_PAD_SZ          = 4,
 +      ATA_DMA_PAD_BUF_SZ      = ATA_DMA_PAD_SZ * ATA_MAX_QUEUE,
+       
+       /* Masks for port functions */
+       ATA_PORT_PRIMARY        = (1 << 0),
+       ATA_PORT_SECONDARY      = (1 << 1),
  };
  
- enum pio_task_states {
-       PIO_ST_UNKNOWN,
-       PIO_ST_IDLE,
-       PIO_ST_POLL,
-       PIO_ST_TMOUT,
-       PIO_ST,
-       PIO_ST_LAST,
-       PIO_ST_LAST_POLL,
-       PIO_ST_ERR,
+ enum hsm_task_states {
+       HSM_ST_UNKNOWN,
+       HSM_ST_IDLE,
+       HSM_ST_POLL,
+       HSM_ST_TMOUT,
+       HSM_ST,
+       HSM_ST_LAST,
+       HSM_ST_LAST_POLL,
+       HSM_ST_ERR,
  };
  
  /* forward declarations */