projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f93585 b28a613)
Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Mar 2014 19:52:45 +0000 (11:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Mar 2014 19:52:45 +0000 (11:52 -0800)
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


Trivial merge
Linux Kernel tree with some unpolished code for Colibri/Apalis modules