[PATCH 1/2] MAINTAINERS: Update Martyn Welch's address

[Bagas Sanjaya]

He is now active on the mailing lists using his Collabora
(@collabora.com) address. Reflect it in MAINTAINERS and also
add address mapping for him.

Cc: Martyn Welch <martyn.welch@xxxxxxxxxxxxx>
Signed-off-by: Bagas Sanjaya <bagasdotme@xxxxxxxxx>
---
Martyn, if you still had like to maintain VME subsystem, please let us know.

 .mailmap    | 1 +
 MAINTAINERS | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 43031441b2d922..1df03996c73bdf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -368,6 +368,7 @@ Mark Yao <markyao0591@xxxxxxxxx> <mark.yao@xxxxxxxxxxxxxx>
 Martin Kepplinger <martink@xxxxxxxxx> <martin.kepplinger@xxxxxxxxxxxxx>
 Martin Kepplinger <martink@xxxxxxxxx> <martin.kepplinger@xxxxxxx>
 Martin Kepplinger <martink@xxxxxxxxx> <martin.kepplinger@xxxxxxxxxxxxxxxxxxxxx>
+Martyn Welch <martyn.welch@xxxxxxxxxxxxx> <martyn.welch@xxxxxxxxxxxxxxx> <martyn@xxxxxxxxxxxx>
 Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@xxxxxxxxxxxxxxx> <martyna.szapar-mudlaw@xxxxxxxxx>
 Mathieu Othacehe <m.othacehe@xxxxxxxxx>
 Mat Martineau <martineau@xxxxxxxxxx> <mathew.j.martineau@xxxxxxxxxxxxxxx>
diff --git a/MAINTAINERS b/MAINTAINERS
index ea790149af7951..a02aa52fabe14b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -23234,7 +23234,7 @@ F:	include/linux/vmalloc.h
 F:	mm/vmalloc.c
 
 VME SUBSYSTEM
-M:	Martyn Welch <martyn@xxxxxxxxxxxx>
+M:	Martyn Welch <martyn.welch@xxxxxxxxxxxxx>
 M:	Manohar Vanga <manohar.vanga@xxxxxxxxx>
 M:	Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
 L:	linux-kernel@xxxxxxxxxxxxxxx
-- 
An old man doll... just what I always wanted! - Clara