tree a7cd463383722f0c74e9965b1843d829b2a95252
parent 9f93585fdfd34a6fcbad16c0f1e031492df63ad1
parent b28a613e9138e4b3a64649bd60b13436f4b4b49b
author Linus Torvalds <torvalds@linux-foundation.org> 1394308365 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1394308365 -0800

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

Pull libata fixes from Tejun Heo:
 "Just a couple patches blacklisting more broken devices"

* 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  libata: add ATA_HORKAGE_BROKEN_FPDMA_AA quirk for Seagate Momentus SpinPoint M8 (2BA30001)
  libata: disable queued TRIM for Crucial M500 mSATA SSDs