Beside updating email, the patch updates maintainers of Samsung drivers. Signed-off-by: Andrzej Hajda <andrzej.hajda@xxxxxxxxx> --- .mailmap | 1 + MAINTAINERS | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.mailmap b/.mailmap index 4f6e37da60589..4283a86f70d26 100644 --- a/.mailmap +++ b/.mailmap @@ -40,6 +40,7 @@ Andrew Vasquez <andrew.vasquez@xxxxxxxxxx> Andrey Konovalov <andreyknvl@xxxxxxxxx> <andreyknvl@xxxxxxxxxx> Andrey Ryabinin <ryabinin.a.a@xxxxxxxxx> <a.ryabinin@xxxxxxxxxxx> Andrey Ryabinin <ryabinin.a.a@xxxxxxxxx> <aryabinin@xxxxxxxxxxxxx> +Andrzej Hajda <andrzej.hajda@xxxxxxxxx> <a.hajda@xxxxxxxxxxx> Andy Adamson <andros@xxxxxxxxxxxxxx> Antoine Tenart <atenart@xxxxxxxxxx> <antoine.tenart@xxxxxxxxxxx> Antoine Tenart <atenart@xxxxxxxxxx> <antoine.tenart@xxxxxxxxxxxxxxxxxx> diff --git a/MAINTAINERS b/MAINTAINERS index 54cd05d3aab65..e3fadb4ebced3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2546,7 +2546,7 @@ N: s3c64xx N: s5pv210 ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT -M: Andrzej Hajda <a.hajda@xxxxxxxxxxx> +M: Łukasz Stelmach <l.stelmach@xxxxxxxxxxx> L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers) L: linux-media@xxxxxxxxxxxxxxx S: Maintained @@ -2570,7 +2570,8 @@ S: Maintained F: drivers/media/platform/s5p-jpeg/ ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT -M: Andrzej Hajda <a.hajda@xxxxxxxxxxx> +M: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> +M: Andrzej Hajda <andrzej.hajda@xxxxxxxxx> L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers) L: linux-media@xxxxxxxxxxxxxxx S: Maintained @@ -6254,7 +6255,7 @@ F: Documentation/devicetree/bindings/display/atmel/ F: drivers/gpu/drm/atmel-hlcdc/ DRM DRIVERS FOR BRIDGE CHIPS -M: Andrzej Hajda <a.hajda@xxxxxxxxxxx> +M: Andrzej Hajda <andrzej.hajda@xxxxxxxxx> M: Neil Armstrong <narmstrong@xxxxxxxxxxxx> M: Robert Foss <robert.foss@xxxxxxxxxx> R: Laurent Pinchart <Laurent.pinchart@xxxxxxxxxxxxxxxx> @@ -16748,13 +16749,15 @@ F: Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml F: drivers/nfc/s3fwrn5 SAMSUNG S5C73M3 CAMERA DRIVER -M: Andrzej Hajda <a.hajda@xxxxxxxxxxx> +M: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx> +M: Andrzej Hajda <andrzej.hajda@xxxxxxxxx> L: linux-media@xxxxxxxxxxxxxxx S: Supported F: drivers/media/i2c/s5c73m3/* SAMSUNG S5K5BAF CAMERA DRIVER -M: Andrzej Hajda <a.hajda@xxxxxxxxxxx> +M: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx> +M: Andrzej Hajda <andrzej.hajda@xxxxxxxxx> L: linux-media@xxxxxxxxxxxxxxx S: Supported F: drivers/media/i2c/s5k5baf.c -- 2.25.1