diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-10 12:56:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-10 12:56:24 -0700 |
| commit | 2b64c5434d1303646388e748b7add69624a1cfee (patch) | |
| tree | 2eabc8d525d908d672748448457fe6b8fcac33ab /fs/devpts | |
| parent | fa389e220254c69ffae0d403eac4146171062d08 (diff) | |
| parent | 83493d7e782d2630f1a55def14a79f0e7c4faac3 (diff) | |
Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixlet from Tejun Heo:
"I merged the two blaclist entries into 'Crucial_CT???M500SSD*'"
* 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
libata: use wider match for blacklisting Crucial M500
Diffstat (limited to 'fs/devpts')
0 files changed, 0 insertions, 0 deletions