diff options
| author | Linus Torvalds <[email protected]> | 2015-03-30 18:08:37 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2015-03-30 18:08:37 +0000 |
| commit | 32374ea8fe1196e045c9e74078a662664af8971c (patch) | |
| tree | 267caf2d662a2ee74e094221f26627be3adc31ba /net/tipc/node.c | |
| parent | Merge tag 'gpio-v4.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linu... (diff) | |
| parent | libata: Blacklist queued TRIM on Samsung SSD 850 Pro (diff) | |
| download | kernel-32374ea8fe1196e045c9e74078a662664af8971c.tar.gz kernel-32374ea8fe1196e045c9e74078a662664af8971c.zip | |
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
Diffstat (limited to 'net/tipc/node.c')
0 files changed, 0 insertions, 0 deletions