From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Mar 2014 19:56:24 +0000 (-0700)
Subject: Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: v3.14-rc7~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b64c5434d1303646388e748b7add69624a1cfee;p=profile%2Fivi%2Fkernel-x86-ivi.git

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
---

2b64c5434d1303646388e748b7add69624a1cfee