aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <[email protected]>2020-01-29 17:00:05 -0600
committerBjorn Helgaas <[email protected]>2020-01-29 17:00:05 -0600
commitd86936363c108bcd7fa1635601f78633c7ee1f71 (patch)
tree0460c344dd4ba67b86108a9735476a8c6eff94c8
parent518fc4a3a609dd5a5ce7044fed1338c76511a182 (diff)
parent216bbaa337bf240dc8c2ac413f0a0f3cf08ee338 (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--.mailmap2
-rw-r--r--MAINTAINERS2
-rw-r--r--drivers/pci/controller/dwc/pci-exynos.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index c24773db04a7..610508725841 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,6 +27,8 @@ Andi Shyti <[email protected]> <[email protected]>
Andreas Herrmann <[email protected]>
Andrew Morton <[email protected]>
Andrew Vasquez <[email protected]>
Andy Adamson <[email protected]>
Antoine Tenart <[email protected]>
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 <[email protected]>
-R: Andrew Murray <[email protected]>
+R: Andrew Murray <[email protected]>
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