Merge branch 'remotes/lorenzo/pci/misc'

bjorn-helgaas · bjorn-helgaas · commit d86936363c10 · 2020-01-29T17:00:05.000-06:00
- 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
diff --git a/.mailmap b/.mailmap
@@ -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
@@ -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
@@ -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

-Original file line number
+Diff line change
 Andreas Herrmann <[email protected]>
 Andrey Ryabinin <[email protected]> <[email protected]>
 Andrew Morton <[email protected]>
 +Andrew Murray <[email protected]> <[email protected]>
 +Andrew Murray <[email protected]> <[email protected]>
 Andrew Vasquez <[email protected]>
 Andy Adamson <[email protected]>
 Antoine Tenart <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// SPDX-License-Identifier: GPL-2.0`
`2`	`2`	`/*`
`3`		`- * PCIe host controller driver for Samsung EXYNOS SoCs`
	`3`	`+ * PCIe host controller driver for Samsung Exynos SoCs`
`4`	`4`	`*`
`5`	`5`	`* Copyright (C) 2013 Samsung Electronics Co., Ltd.`
`6`	`6`	`* http://www.samsung.com`