Merge branch 'for-3.16' into for-next

Conflicts:
	drivers/ata/ahci.h

diff --cc drivers/ata/ahci.h
index af63c75c20011e10d76be66edb27d595cb47978c,60db49b95001fcf45e171e64e37c3712d0170ca3..05882e4445a6657ea4bc109aed40efeb8dc2e1f7
--- 1/drivers/ata/ahci.h
--- 2/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@@ -236,7 -235,7 +236,8 @@@ enum 
                                                        port start (wait until
                                                        error-handling stage) */
        AHCI_HFLAG_MULTI_MSI            = (1 << 16), /* multiple PCI MSIs */
 -      AHCI_HFLAG_NO_FBS               = (1 << 17), /* no FBS */
 +      AHCI_HFLAG_NO_DEVSLP            = (1 << 17), /* no device sleep */
++      AHCI_HFLAG_NO_FBS               = (1 << 18), /* no FBS */
  
        /* ap->flags bits */
  

diff --cc drivers/ata/ahci_imx.c
index 8befeb69eeb1133afc62daa43b1fb41af584994e,e7e44a73e4fe25919dccc0594b5379a31cd07f3e..3a901520c62bdacf7eec01af48abc21526ccc2c3
--- 1/drivers/ata/ahci_imx.c
--- 2/drivers/ata/ahci_imx.c
+++ b/drivers/ata/ahci_imx.c
@@@ -430,9 -265,10 +430,10 @@@ static int imx_ahci_probe(struct platfo
        }
  
        reg_val = clk_get_rate(imxpriv->ahb_clk) / 1000;
 -      writel(reg_val, hpriv->mmio + HOST_TIMER1MS);
 +      writel(reg_val, hpriv->mmio + IMX_TIMER1MS);
  
-       ret = ahci_platform_init_host(pdev, hpriv, &ahci_imx_port_info, 0, 0);
+       ret = ahci_platform_init_host(pdev, hpriv, &ahci_imx_port_info,
+                                     0, 0, 0);
        if (ret)
                imx_sata_disable(hpriv);
  

diff --cc drivers/ata/libahci.c
Simple merge