tree 2eabc8d525d908d672748448457fe6b8fcac33ab
parent fa389e220254c69ffae0d403eac4146171062d08
parent 83493d7e782d2630f1a55def14a79f0e7c4faac3
author Linus Torvalds <torvalds@linux-foundation.org> 1394481384 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1394481384 -0700

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