Update my main e-mails at the Kernel tree

For the third time in three years, I'm changing my e-mail at
Samsung. That's bad, as it may stop communications with me for
a while. So, this time, I'll also the [email protected] e-mail,
as it remains stable since ever.

Cc: [email protected]
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

5 files changed, 38 insertions, 19 deletions

diff --git a/.mailmap b/.mailmap
index 08b80428f583..4a293bea648d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -89,6 +89,7 @@ Leonid I Ananiev <[email protected]>
 Linas Vepstas <[email protected]>
 Mark Brown <[email protected]>
 Matthieu CASTET <[email protected]>
+Mauro Carvalho Chehab <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]>
 Mayuresh Janorkar <[email protected]>
 Michael Buesch <[email protected]>
 Michel Dänzer <[email protected]>
diff --git a/CREDITS b/CREDITS
index 0f0bf22afe0c..2a3fbcd229e6 100644
--- a/CREDITS
+++ b/CREDITS
@@ -649,6 +649,7 @@ D: Configure, Menuconfig, xconfig
 
 N: Mauro Carvalho Chehab
 E: [email protected]
+E: [email protected]
 E: [email protected]
 D: Media subsystem (V4L/DVB) drivers and core
 D: EDAC drivers and EDAC 3.0 core rework
diff --git a/MAINTAINERS b/MAINTAINERS
index 45fad6cecc88..02299fd2db18 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2242,7 +2242,8 @@ F:	include/net/ax25.h
 F:	net/ax25/
 
 AZ6007 DVB DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
@@ -2709,7 +2710,8 @@ F:	Documentation/filesystems/btrfs.txt
 F:	fs/btrfs/
 
 BTTV VIDEO4LINUX DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
@@ -3343,7 +3345,8 @@ S:	Maintained
 F:	drivers/media/dvb-frontends/cx24120*
 
 CX88 VIDEO4LINUX DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
@@ -4290,7 +4293,8 @@ F:	fs/ecryptfs/
 EDAC-CORE
 M:	Doug Thompson <[email protected]>
 M:	Borislav Petkov <[email protected]>
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
@@ -4335,7 +4339,8 @@ S:	Maintained
 F:	drivers/edac/e7xxx_edac.c
 
 EDAC-GHES
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/edac/ghes_edac.c
@@ -4359,19 +4364,22 @@ S:	Maintained
 F:	drivers/edac/i5000_edac.c
 
 EDAC-I5400
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/edac/i5400_edac.c
 
 EDAC-I7300
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/edac/i7300_edac.c
 
 EDAC-I7CORE
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/edac/i7core_edac.c
@@ -4408,7 +4416,8 @@ S:	Maintained
 F:	drivers/edac/r82600_edac.c
 
 EDAC-SBRIDGE
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/edac/sb_edac.c
@@ -4467,7 +4476,8 @@ S:	Maintained
 F:	drivers/net/ethernet/ibm/ehea/
 
 EM28XX VIDEO4LINUX DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
@@ -7371,7 +7381,8 @@ S:	Supported
 F:	drivers/media/pci/netup_unidvb/*
 
 MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 P:	LinuxTV.org Project
 L:	[email protected]
 W:	https://linuxtv.org
@@ -9863,7 +9874,8 @@ S:	Odd Fixes
 F:	drivers/media/i2c/saa6588*
 
 SAA7134 VIDEO4LINUX DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
@@ -10382,7 +10394,8 @@ S:	Maintained
 F:	drivers/media/radio/si4713/radio-usb-si4713.c
 
 SIANO DVB DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
@@ -11148,7 +11161,8 @@ S:	Maintained
 F:	drivers/media/i2c/tda9840*
 
 TEA5761 TUNER DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
@@ -11156,7 +11170,8 @@ S:	Odd fixes
 F:	drivers/media/tuners/tea5761.*
 
 TEA5767 TUNER DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
@@ -11543,7 +11558,8 @@ F:	include/linux/shmem_fs.h
 F:	mm/shmem.c
 
 TM6000 VIDEO4LINUX DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
@@ -12529,7 +12545,8 @@ S:	Maintained
 F:	arch/x86/entry/vdso/
 
 XC2028/3028 TUNER DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
+M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c
index ca94bded3386..8bef4331bd51 100644
--- a/drivers/media/v4l2-core/v4l2-mc.c
+++ b/drivers/media/v4l2-core/v4l2-mc.c
@@ -1,7 +1,7 @@
 /*
  * Media Controller ancillary functions
  *
- * Copyright (c) 2016 Mauro Carvalho Chehab <[email protected]>
+ * Copyright (c) 2016 Mauro Carvalho Chehab <[email protected]>
  * Copyright (C) 2016 Shuah Khan <[email protected]>
  * Copyright (C) 2006-2010 Nokia Corporation
  * Copyright (c) 2016 Intel Corporation.
diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h
index 98a938aabdfb..7a8d6037a4bb 100644
--- a/include/media/v4l2-mc.h
+++ b/include/media/v4l2-mc.h
@@ -1,7 +1,7 @@
 /*
  * v4l2-mc.h - Media Controller V4L2 types and prototypes
  *
- * Copyright (C) 2016 Mauro Carvalho Chehab <[email protected]>
+ * Copyright (C) 2016 Mauro Carvalho Chehab <[email protected]>
  * Copyright (C) 2006-2010 Nokia Corporation
  * Copyright (c) 2016 Intel Corporation.
  *