Beside updating email, the patch updates maintainers of Samsung drivers.
Signed-off-by: Andrzej Hajda andrzej.hajda@intel.com --- .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@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 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@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 @@ -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@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 @@ -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@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 @@ -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@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