summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2022-11-24 10:08:03 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2022-11-24 10:08:03 -0300
commit0c3852adae830d09d7dd62f03173c0225f617c86 (patch)
treeab03f159d0790a6ea810740e0ae5d7f86223f589 /MAINTAINERS
parentbe3392b65f2b989badcadf5f6a353c7924d3ccf4 (diff)
parentc3eb11fbb826879be773c137f281569efce67aa8 (diff)
downloadlinux-0c3852adae830d09d7dd62f03173c0225f617c86.tar.gz
linux-0c3852adae830d09d7dd62f03173c0225f617c86.tar.bz2
linux-0c3852adae830d09d7dd62f03173c0225f617c86.zip
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 170f1763557a..7a3334f6fe9c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15952,6 +15952,7 @@ Q: https://patchwork.kernel.org/project/linux-pci/list/
B: https://bugzilla.kernel.org
C: irc://irc.oftc.net/linux-pci
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git
+F: Documentation/devicetree/bindings/pci/
F: drivers/pci/controller/
F: drivers/pci/pci-bridge-emul.c
F: drivers/pci/pci-bridge-emul.h
@@ -16058,7 +16059,7 @@ F: Documentation/devicetree/bindings/pci/microchip*
F: drivers/pci/controller/*microchip*
PCIE DRIVER FOR QUALCOMM MSM
-M: Stanimir Varbanov <svarbanov@mm-sol.com>
+M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
L: linux-pci@vger.kernel.org
L: linux-arm-msm@vger.kernel.org
S: Maintained