diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-01-29 17:00:05 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-01-29 17:00:05 -0600 |
| commit | d86936363c108bcd7fa1635601f78633c7ee1f71 (patch) | |
| tree | 0460c344dd4ba67b86108a9735476a8c6eff94c8 | |
| parent | 518fc4a3a609dd5a5ce7044fed1338c76511a182 (diff) | |
| parent | 216bbaa337bf240dc8c2ac413f0a0f3cf08ee338 (diff) | |
Merge branch 'remotes/lorenzo/pci/misc'
- Fix "EXYNOS" typographical styling (Krzysztof Kozlowski)
- Update MAINTAINERS with Andrew Murray's email address (Andrew Murray)
* remotes/lorenzo/pci/misc:
MAINTAINERS: Update my email address
PCI: exynos: Rename Exynos to lowercase
| -rw-r--r-- | .mailmap | 2 | ||||
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/pci/controller/dwc/pci-exynos.c | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -27,6 +27,8 @@ Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com> Andreas Herrmann <aherrman@de.ibm.com> Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com> Andrew Morton <akpm@linux-foundation.org> +Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com> +Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk> Andrew Vasquez <andrew.vasquez@qlogic.com> Andy Adamson <andros@citi.umich.edu> Antoine Tenart <antoine.tenart@free-electrons.com> diff --git a/MAINTAINERS b/MAINTAINERS index bd5847e802de..9f6b54cb1835 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12774,7 +12774,7 @@ F: arch/x86/kernel/early-quirks.c PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> -R: Andrew Murray <andrew.murray@arm.com> +R: Andrew Murray <amurray@thegoodpenguin.co.uk> L: linux-pci@vger.kernel.org Q: http://patchwork.ozlabs.org/project/linux-pci/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/ diff --git a/drivers/pci/controller/dwc/pci-exynos.c b/drivers/pci/controller/dwc/pci-exynos.c index 14a6ba4067fb..c5043d951e80 100644 --- a/drivers/pci/controller/dwc/pci-exynos.c +++ b/drivers/pci/controller/dwc/pci-exynos.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * PCIe host controller driver for Samsung EXYNOS SoCs + * PCIe host controller driver for Samsung Exynos SoCs * * Copyright (C) 2013 Samsung Electronics Co., Ltd. * http://www.samsung.com |