Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Jul 2014 18:39:23 +0000 (11:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Jul 2014 18:39:23 +0000 (11:39 -0700)
commit4c71842375f52dc8a8a6097ffcd625243e153649
treeb5d9f7b74d206585349c26d1c83c6b3164407042
parent40f6123737d45b94ae0e4c89252a695ba6794e59
parent2a0bdff6b958d1b2523d2754b6cd5e0ea4053016
Merge branch 'for-3.16-fixes' of git://git./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