Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Mar 2014 19:56:24 +0000 (12:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Mar 2014 19:56:24 +0000 (12:56 -0700)
commit2b64c5434d1303646388e748b7add69624a1cfee
tree2eabc8d525d908d672748448457fe6b8fcac33ab
parentfa389e220254c69ffae0d403eac4146171062d08
parent83493d7e782d2630f1a55def14a79f0e7c4faac3
Merge branch 'for-3.14-fixes' of git://git./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