summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-03-10 20:56:24 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2014-03-10 20:56:24 +0100
commit2b64c5434d1303646388e748b7add69624a1cfee (patch)
tree2eabc8d525d908d672748448457fe6b8fcac33ab /init
parentLinux 3.14-rc6 (diff)
parentlibata: use wider match for blacklisting Crucial M500 (diff)
downloadlinux-2b64c5434d1303646388e748b7add69624a1cfee.tar.xz
linux-2b64c5434d1303646388e748b7add69624a1cfee.zip
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 'init')
0 files changed, 0 insertions, 0 deletions