Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Mar 2015 18:08:37 +0000 (11:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Mar 2015 18:08:37 +0000 (11:08 -0700)
commit32374ea8fe1196e045c9e74078a662664af8971c
tree267caf2d662a2ee74e094221f26627be3adc31ba
parent29059af3f2b5b2b4d5227cb0595833d1db5545dc
parent6fc4d97a4987c5d247655a157a9377996626221a
Merge branch 'for-4.0-fixes' of git://git./linux/kernel/git/tj/libata

Pull libata fixes from Tejun Heo:
 "Nothing exciting.  Two patches to update queued trim blacklist"

* 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  libata: Blacklist queued TRIM on Samsung SSD 850 Pro
  libata: Update Crucial/Micron blacklist