| commit | 577e75e0c9da98b898d2dbe94c30b40eec5b9c99 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 24 09:36:16 2018 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 24 09:36:16 2018 -0700 |
| tree | c452e15e74a8531e1207beef5c1c15be1c08b901 | |
| parent | b68ea0ee0362e935a7b4627b9728f6cee95286d7 [diff] | |
| parent | 4544e403eb25552aed7f0ee181a7a506b8800403 [diff] |
Merge branch 'for-4.17-fixes' of git://git.kernel.org/pub/scm/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