summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2019-11-28 08:54:52 -0600
committerBjorn Helgaas <bhelgaas@google.com>2019-11-28 08:54:52 -0600
commitd8ddab63635d4b474a99424538001932884b55ae (patch)
treeeab00b143a5ff48f7daf7d9f44a6749b3d006027 /MAINTAINERS
parent77471510559cdb60cd3dd4e93dca5bfe71b0f5c6 (diff)
parente3d023b8952b78b82b1f9c6d7b708680a99ea831 (diff)
downloadlinux-stable-d8ddab63635d4b474a99424538001932884b55ae.tar.gz
linux-stable-d8ddab63635d4b474a99424538001932884b55ae.tar.bz2
linux-stable-d8ddab63635d4b474a99424538001932884b55ae.zip
Merge branch 'remotes/lorenzo/pci/vmd'
- Add VMD bus 224-255 restriction decode (Jon Derrick) - Add VMD 8086:9A0B device ID (Jon Derrick) - Remove Keith from VMD maintainer list (Keith Busch) * remotes/lorenzo/pci/vmd: MAINTAINERS: Remove Keith from VMD maintainer PCI: vmd: Add device id for VMD device 8086:9A0B PCI: vmd: Add bus 224-255 restriction decode
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e51a68bf8ca8..165d9a252bb9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12447,7 +12447,6 @@ F: Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
F: drivers/pci/controller/dwc/*imx6*
PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
-M: Keith Busch <keith.busch@intel.com>
M: Jonathan Derrick <jonathan.derrick@intel.com>
L: linux-pci@vger.kernel.org
S: Supported