From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Mar 2014 19:52:45 +0000 (-0800)
Subject: Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: firefly_0821_release~176^2~4311
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=15b04859a21358f8aec1c06b4604877d604b05ee;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-3.14-fixes' of git://git./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
---

15b04859a21358f8aec1c06b4604877d604b05ee