MAINTAINERS: update my e-mail address

Update my e-mail address to @samsung.com in maintainers.
Add also map in .mailmap to new e-mail.

Signed-off-by: Kamil Konieczny <k.konieczny@samsung.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/.mailmap b/.mailmap
index c24773db04a7ab3ee9ddd5e8472796363f720be1..7d890c48984ec3c668df3b2487c5e914748916e4 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -137,6 +137,7 @@ Juha Yrjola <at solidboot.com>
 Juha Yrjola <juha.yrjola@nokia.com>
 Juha Yrjola <juha.yrjola@solidboot.com>
 Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
+Kamil Konieczny <k.konieczny@samsung.com> <k.konieczny@partner.samsung.com>
 Kay Sievers <kay.sievers@vrfy.org>
 Kenneth W Chen <kenneth.w.chen@intel.com>
 Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index bd5847e802defb11887f45dd17412e1e98d054e8..8e9925328c6f2d2a8c1df820a3eea63d2814a0c4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14492,7 +14492,7 @@ F:      drivers/media/i2c/s5k5baf.c
 SAMSUNG S5P Security SubSystem (SSS) DRIVER
 M:     Krzysztof Kozlowski <krzk@kernel.org>
 M:     Vladimir Zapolskiy <vz@mleia.com>
-M:     Kamil Konieczny <k.konieczny@partner.samsung.com>
+M:     Kamil Konieczny <k.konieczny@samsung.com>
 L:     linux-crypto@vger.kernel.org
 L:     linux-samsung-soc@vger.kernel.org
 S:     Maintained