diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-11-28 08:54:54 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-11-28 08:54:54 -0600 |
| commit | 48617f03c94088780c86692593b0a9b10f74530f (patch) | |
| tree | 9e88fc6154a77b5d6871dd4ebc494b7a06c20fe9 /MAINTAINERS | |
| parent | 7bd4c4a7b0ff94ef01247f905cd568fb67c747e0 (diff) | |
| parent | 3c379a59b4795d7279d38c623e74b9790345a32b (diff) | |
| download | linux-48617f03c94088780c86692593b0a9b10f74530f.tar.gz linux-48617f03c94088780c86692593b0a9b10f74530f.tar.bz2 linux-48617f03c94088780c86692593b0a9b10f74530f.zip | |
Merge branch 'remotes/lorenzo/pci/misc'
- Fix iproc-msi and mvebu __iomem annotations (Ben Dooks)
- Make mvebu_pci_bridge_emul_ops static (Ben Dooks)
- Add Marek Vasut and Yoshihiro Shimoda as R-Car maintainers (Simon
Horman)
- Fix pcitest.c fd leak (Hewenliang)
* remotes/lorenzo/pci/misc:
tools: PCI: Fix fd leakage
MAINTAINERS: Add Marek and Shimoda-san as R-Car PCIE co-maintainers
PCI: mvebu: mvebu_pcie_map_registers __iomem fix
PCI: mvebu: Make mvebu_pci_bridge_emul_ops static
PCI: iproc-msi: Fix __iomem annotation in decode_msi_hwirq()
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 165d9a252bb9..182d15c63d54 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12489,7 +12489,8 @@ F: Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt F: drivers/pci/controller/pci-tegra.c PCI DRIVER FOR RENESAS R-CAR -M: Simon Horman <horms@verge.net.au> +M: Marek Vasut <marek.vasut+renesas@gmail.com> +M: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> L: linux-pci@vger.kernel.org L: linux-renesas-soc@vger.kernel.org S: Maintained |