From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Mar 2015 18:08:37 +0000 (-0700)
Subject: Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=32374ea8fe1196e045c9e74078a662664af8971c;p=people%2Fjulieng%2Flinux-arm.git

Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/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
---

32374ea8fe1196e045c9e74078a662664af8971c