| commit | 32374ea8fe1196e045c9e74078a662664af8971c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 30 11:08:37 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 30 11:08:37 2015 -0700 |
| tree | 267caf2d662a2ee74e094221f26627be3adc31ba | |
| parent | 29059af3f2b5b2b4d5227cb0595833d1db5545dc [diff] | |
| parent | 6fc4d97a4987c5d247655a157a9377996626221a [diff] |
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