• Linus Torvalds's avatar
    Merge branch 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · fbd918a2
    Linus Torvalds authored
    Pull libata updates from Tejun Heo:
     "Support for some new embedded controllers.
    
      A couple late (<= a week) fixes have stable cc'd and one patch ("SATA:
      MV: Add support for the optional PHYs") got committed yesterday
      because otherwise the resulting kernel would fail boot on an embedded
      board due to interdependent changes in its platform tree.
    
      Other than that, nothing too noteworthy"
    
    * 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
      SATA: MV: Add support for the optional PHYs
      sata-highbank: Remove unnecessary ahci_platform.h include
      libata: disable LPM for some WD SATA-I devices
      ARM: mvebu: update the SATA compatible string for Armada 370/XP
      ata: sata_mv: fix disk hotplug for Armada 370/XP SoCs
      ata: sata_mv: introduce compatible string "marvell, armada-370-sata"
      ata: pata_samsung_cf: Remove unused macros
      ata: pata_samsung_cf: Use devm_ioremap_resource()
      ata: pata_samsung_cf: Merge pata_samsung_cf.h into pata_samsung_cf.c
      ata: pata_samsung_cf: Move plat/regs-ata.h to drivers/ata
      drivers: ata: Mark the function as static in libahci.c
      drivers: ata: Mark the function ahci_init_interrupts() as static in ahci.c
      ahci: imx: fix the error handling in imx_ahci_probe()
      ahci: imx: ahci_imx_softreset() can be static
      ahci: imx: Add i.MX53 support
      ahci: imx: Pull out the clock enable/disable calls
      libata, dt: Document sata_rcar bindings
      sata_rcar: Add R-Car Gen2 SATA PHY support
      ahci: mcp89: enter AHCI mode under Apple BIOS emulation
      ata: libata-eh: Remove unnecessary snprintf arithmetic
    fbd918a2
libata-scsi.c 105 KB