media: MAINTAINERS: Update email of Andrzej Hajda

Beside updating email, the patch updates maintainers
of Samsung drivers.

Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Łukasz Stelmach <l.stelmach@samsung.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/.mailmap b/.mailmap
index 14314e3c5d5e230374b34cd800dc63487ee906f7..f4051a214c381d3a5e72b2e1537ba0df5f666092 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -42,6 +42,7 @@ Andrew Vasquez <andrew.vasquez@qlogic.com>
 Andrey Konovalov <andreyknvl@gmail.com> <andreyknvl@google.com>
 Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
 Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>
+Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>
 Andy Adamson <andros@citi.umich.edu>
 Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>
 Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index c869091df7f9d17363352ec6408b83a9a921f20d..24a64ca492378b6e06329640200fcb63d3474fb3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2569,7 +2569,7 @@ N:        s3c64xx
 N:     s5pv210
 
 ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
-M:     Andrzej Hajda <a.hajda@samsung.com>
+M:     Łukasz Stelmach <l.stelmach@samsung.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-media@vger.kernel.org
 S:     Maintained
@@ -2593,7 +2593,8 @@ S:        Maintained
 F:     drivers/media/platform/s5p-jpeg/
 
 ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
-M:     Andrzej Hajda <a.hajda@samsung.com>
+M:     Marek Szyprowski <m.szyprowski@samsung.com>
+M:     Andrzej Hajda <andrzej.hajda@intel.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-media@vger.kernel.org
 S:     Maintained
@@ -6300,7 +6301,7 @@ F:        Documentation/devicetree/bindings/display/atmel/
 F:     drivers/gpu/drm/atmel-hlcdc/
 
 DRM DRIVERS FOR BRIDGE CHIPS
-M:     Andrzej Hajda <a.hajda@samsung.com>
+M:     Andrzej Hajda <andrzej.hajda@intel.com>
 M:     Neil Armstrong <narmstrong@baylibre.com>
 M:     Robert Foss <robert.foss@linaro.org>
 R:     Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
@@ -16824,13 +16825,15 @@ F:    Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
 F:     drivers/nfc/s3fwrn5
 
 SAMSUNG S5C73M3 CAMERA DRIVER
-M:     Andrzej Hajda <a.hajda@samsung.com>
+M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
+M:     Andrzej Hajda <andrzej.hajda@intel.com>
 L:     linux-media@vger.kernel.org
 S:     Supported
 F:     drivers/media/i2c/s5c73m3/*
 
 SAMSUNG S5K5BAF CAMERA DRIVER
-M:     Andrzej Hajda <a.hajda@samsung.com>
+M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
+M:     Andrzej Hajda <andrzej.hajda@intel.com>
 L:     linux-media@vger.kernel.org
 S:     Supported
 F:     drivers/media/i2c/s5k5baf.c