From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Jul 2014 18:39:23 +0000 (-0700)
Subject: Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: v3.16-rc5~25
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4c71842375f52dc8a8a6097ffcd625243e153649;p=~emulex%2Finfiniband.git

Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

Pull libata fixes from Tejun Heo:
 "Nothing too interesting.  All fixes are ahci_platform related"

* 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci_xgene: fix the dma state machine lockup for the IDENTIFY DEVICE PIO mode command.
  libahci: export ahci_qc_issue() and ahci_start_fix_rx()
  ata: ahci_imx: warn when disabling ahci link
  ahci: disable ncq feature for hisilicon sata
  ahci: imx: manage only sata_ref_clk in imx_sata_enable[disable]
  libahci_platform: Fail when PHY required but PHY support disabled
---

4c71842375f52dc8a8a6097ffcd625243e153649