tree 97a236f504dd138d68ae72b0e3368d116e612c78
parent cee5aa1f81b1e88d8de05df226bfd207041954c2
parent 2a13772a144d2956a7fedd18685921d0a9b8b783
author Linus Torvalds <torvalds@linux-foundation.org> 1408656387 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1408656387 -0700

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

Pull libata fixes from Tejun Heo:
 "Nothing drastic but pushing out early due to build breakage in the new
  tegra platform.

  Additionally:

   - M550 tagged trim blacklist pattern is widened so that it matches
     the new 1TB model

   - three controller specific fixes"

* 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  libata: widen Crucial M550 blacklist matching
  pata_scc: propagate return value of scc_wait_after_reset
  ata: ahci_tegra: Change include to fix compilation
  pata_samsung_cf: change ret type to signed
  ahci_xgene: Removing NCQ support from the APM X-Gene SoC AHCI SATA Host Controller driver.