diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-22 14:04:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-22 14:04:47 -0700 |
| commit | 59c36bc8d377c8764eb617a92211e0fc2f1318da (patch) | |
| tree | 85998f37cccefd88b31944c99e7ec92cacf0158a /Documentation | |
| parent | 20eabc8966f5c1973c2dd2450060f4511389a19c (diff) | |
| parent | 7bafda88de20b2990461d253c5475007436e355c (diff) | |
Merge tag 'pci-v5.3-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
- Reset both NVIDIA GPU and HDA in ThinkPad P50 quirk, which was broken
by another quirk that enabled the HDA device (Lyude Paul)
- Fix pciebus-howto.rst documentation filename typo (Bjorn Helgaas)
* tag 'pci-v5.3-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
Documentation PCI: Fix pciebus-howto.rst filename typo
PCI: Reset both NVIDIA GPU and HDA in ThinkPad P50 workaround
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/PCI/index.rst | 2 | ||||
| -rw-r--r-- | Documentation/PCI/pciebus-howto.rst (renamed from Documentation/PCI/picebus-howto.rst) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/PCI/index.rst b/Documentation/PCI/index.rst index f4c6121868c3..6768305e4c26 100644 --- a/Documentation/PCI/index.rst +++ b/Documentation/PCI/index.rst @@ -9,7 +9,7 @@ Linux PCI Bus Subsystem :numbered: pci - picebus-howto + pciebus-howto pci-iov-howto msi-howto acpi-info diff --git a/Documentation/PCI/picebus-howto.rst b/Documentation/PCI/pciebus-howto.rst index f882ff62c51f..f882ff62c51f 100644 --- a/Documentation/PCI/picebus-howto.rst +++ b/Documentation/PCI/pciebus-howto.rst |