projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b68ea0e 4544e40)
Merge branch 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 May 2018 16:36:16 +0000 (09:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 May 2018 16:36:16 +0000 (09:36 -0700)
commit577e75e0c9da98b898d2dbe94c30b40eec5b9c99
treec452e15e74a8531e1207beef5c1c15be1c08b901tree | snapshot
parentb68ea0ee0362e935a7b4627b9728f6cee95286d7commit | diff
parent4544e403eb25552aed7f0ee181a7a506b8800403commit | diff
Merge branch 'for-4.17-fixes' of git://git./linux/kernel/git/tj/libata

Pull libata fixes from Tejun Heo:
 "Nothing too interesting.  Four patches to update the blacklist and
  add a controller ID"

* 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: Add PCI ID for Cannon Lake PCH-LP AHCI
  libata: blacklist Micron 500IT SSD with MU01 firmware
  libata: Apply NOLPM quirk for SAMSUNG PM830 CXM13D1Q.
  libata: Blacklist some Sandisk SSDs for NCQ
Domain: System / Kernel;