diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-11 16:38:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-11 16:38:26 -0800 |
| commit | 8233008f5d9703207c2a725cbfb7fd00e7e025e6 (patch) | |
| tree | 5b742fa40ba8021f81fcd4b07b6f6a8d82a7ae33 /MAINTAINERS | |
| parent | 4fb68f9789cf80817c16462f070a9107febc1478 (diff) | |
| parent | bc79c9851a76d76f269d9ef5150e180825650b67 (diff) | |
| download | linux-8233008f5d9703207c2a725cbfb7fd00e7e025e6.tar.gz linux-8233008f5d9703207c2a725cbfb7fd00e7e025e6.tar.bz2 linux-8233008f5d9703207c2a725cbfb7fd00e7e025e6.zip | |
Merge tag 'pci-v4.9-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
- Update MAINTAINERS for Intel VMD driver filename
- Update Rockchip rk3399 host bridge driver DTS and resets
- Fix ROM shadow problem that made some video device initialization
fail
* tag 'pci-v4.9-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: VMD: Update filename to reflect move
arm64: dts: rockchip: add three new resets for rk3399 PCIe controller
PCI: rockchip: Add three new resets as required properties
PCI: Don't attempt to claim shadow copies of ROM
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 411e3b87b8c2..851b89b9edcb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9335,7 +9335,7 @@ PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD) M: Keith Busch <keith.busch@intel.com> L: linux-pci@vger.kernel.org S: Supported -F: arch/x86/pci/vmd.c +F: drivers/pci/host/vmd.c PCIE DRIVER FOR ST SPEAR13XX M: Pratyush Anand <pratyush.anand@gmail.com> |