Merge branch 'upstream'

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

diff --cc drivers/scsi/sata_mv.c
index b8f1f69,d457f56..e721403
--- 1/drivers/scsi/sata_mv.c
--- 2/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@@ -71,7 -85,11 +85,12 @@@ enum 
        /* Host Flags */
        MV_FLAG_DUAL_HC         = (1 << 30),  /* two SATA Host Controllers */
        MV_FLAG_IRQ_COALESCE    = (1 << 29),  /* IRQ coalescing capability */
-       MV_FLAG_BDMA            = (1 << 28),  /* Basic DMA */
+       MV_FLAG_GLBL_SFT_RST    = (1 << 28),  /* Global Soft Reset support */
+       MV_COMMON_FLAGS         = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
 -                                 ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO),
++                                 ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |
++                                 ATA_FLAG_PIO_POLLING),
+       MV_6XXX_FLAGS           = (MV_FLAG_IRQ_COALESCE | 
+                                  MV_FLAG_GLBL_SFT_RST),
  
        chip_504x               = 0,
        chip_508x               = 1,

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

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