[PATCH] MAINTAINERS: Update my email address

[Maxime Ripard]

Use my kernel.org address instead of the bootlin one.

Signed-off-by: Maxime Ripard <maxime.ripard at bootlin.com>
---
 .mailmap    |  2 ++
 MAINTAINERS | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.mailmap b/.mailmap
index 0fef932de3db..509d258a9e77 100644
--- a/.mailmap
+++ b/.mailmap
@@ -157,6 +157,8 @@ Matt Ranostay <mranostay at gmail.com> Matthew Ranostay <mranostay at embeddedalley.co
 Matt Ranostay <mranostay at gmail.com> <matt.ranostay at intel.com>
 Matt Ranostay <matt.ranostay at konsulko.com> <matt at ranostay.consulting>
 Matt Redfearn <matt.redfearn at mips.com> <matt.redfearn at imgtec.com>
+Maxime Ripard <mripard at kernel.org> <maxime.ripard at bootlin.com>
+Maxime Ripard <mripard at kernel.org> <maxime.ripard at free-electrons.com>
 Mayuresh Janorkar <mayur at ti.com>
 Michael Buesch <m at bues.ch>
 Michel Dänzer <michel at tungstengraphics.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index 6743ce648118..0f9e0c458717 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -683,7 +683,7 @@ S:	Maintained
 F:	drivers/crypto/sunxi-ss/
 
 ALLWINNER VPU DRIVER
-M:	Maxime Ripard <maxime.ripard at bootlin.com>
+M:	Maxime Ripard <mripard at kernel.org>
 M:	Paul Kocialkowski <paul.kocialkowski at bootlin.com>
 L:	linux-media at vger.kernel.org
 S:	Maintained
@@ -1408,7 +1408,7 @@ S:	Maintained
 F:	drivers/clk/sunxi/
 
 ARM/Allwinner sunXi SoC support
-M:	Maxime Ripard <maxime.ripard at bootlin.com>
+M:	Maxime Ripard <mripard at kernel.org>
 M:	Chen-Yu Tsai <wens at csie.org>
 L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
@@ -3573,7 +3573,7 @@ F:	Documentation/filesystems/caching/cachefiles.txt
 F:	fs/cachefiles/
 
 CADENCE MIPI-CSI2 BRIDGES
-M:	Maxime Ripard <maxime.ripard at bootlin.com>
+M:	Maxime Ripard <mripard at kernel.org>
 L:	linux-media at vger.kernel.org
 S:	Maintained
 F:	Documentation/devicetree/bindings/media/cdns,*.txt
@@ -5291,7 +5291,7 @@ F:	include/linux/vga*
 
 DRM DRIVERS AND MISC GPU PATCHES
 M:	Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
-M:	Maxime Ripard <maxime.ripard at bootlin.com>
+M:	Maxime Ripard <mripard at kernel.org>
 M:	Sean Paul <sean at poorly.run>
 W:	https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
 S:	Maintained
@@ -5304,7 +5304,7 @@ F:	include/uapi/drm/drm*
 F:	include/linux/vga*
 
 DRM DRIVERS FOR ALLWINNER A10
-M:	Maxime Ripard  <maxime.ripard at bootlin.com>
+M:	Maxime Ripard <mripard at kernel.org>
 L:	dri-devel at lists.freedesktop.org
 S:	Supported
 F:	drivers/gpu/drm/sun4i/
-- 
2.21.0