[PATCH] MAINTAINERS: Update Jisheng's email address

[Jisheng Zhang]

I'm leaving synaptics. Update my email address to my korg mail
address and add entries to .mailmap as well to map my work
addresses to korg mail address.

Signed-off-by: Jisheng Zhang <Jisheng.Zhang at synaptics.com>
---
 .mailmap    | 2 ++
 MAINTAINERS | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 10ee1103c823..4e9dc453b893 100644
--- a/.mailmap
+++ b/.mailmap
@@ -187,6 +187,8 @@ Jiri Slaby <jirislaby at kernel.org> <jslaby at novell.com>
 Jiri Slaby <jirislaby at kernel.org> <jslaby at suse.com>
 Jiri Slaby <jirislaby at kernel.org> <jslaby at suse.cz>
 Jiri Slaby <jirislaby at kernel.org> <xslaby at fi.muni.cz>
+Jisheng Zhang <jszhang at kernel.org> <jszhang at marvell.com>
+Jisheng Zhang <jszhang at kernel.org> <Jisheng.Zhang at synaptics.com>
 Johan Hovold <johan at kernel.org> <jhovold at gmail.com>
 Johan Hovold <johan at kernel.org> <johan at hovoldconsulting.com>
 John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
diff --git a/MAINTAINERS b/MAINTAINERS
index d2b39f444abf..bfaa3aa685cd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2739,7 +2739,7 @@ N:	stm32
 N:	stm
 
 ARM/Synaptics SoC support
-M:	Jisheng Zhang <Jisheng.Zhang at synaptics.com>
+M:	Jisheng Zhang <jszhang at kernel.org>
 M:	Sebastian Hesselbarth <sebastian.hesselbarth at gmail.com>
 L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
-- 
2.34.1