MAINTAINERS: Update my email address

I will lose access to my @arm.com email address next week, so
let's update the MAINTAINERS file and map it correctly in
.mailmap

Signed-off-by: Andrew Murray <andrew.murray@arm.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

diff --git a/.mailmap b/.mailmap
index c24773db04a7ab3ee9ddd5e8472796363f720be1..610508725841984601ab0ad18d9193a12a61933e 100644 (file)
--- 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
index bd5847e802defb11887f45dd17412e1e98d054e8..9f6b54cb183523f69ec6fc33dc1467d40c3d5eae 100644 (file)
--- 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/