aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS2
2 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index c24773db04a7..7d890c48984e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -137,6 +137,7 @@ Juha Yrjola <at solidboot.com>
Juha Yrjola <[email protected]>
Juha Yrjola <[email protected]>
Kay Sievers <[email protected]>
Kenneth W Chen <[email protected]>
Konstantin Khlebnikov <[email protected]> <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index bd5847e802de..8e9925328c6f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14492,7 +14492,7 @@ F: drivers/media/i2c/s5k5baf.c
SAMSUNG S5P Security SubSystem (SSS) DRIVER
M: Krzysztof Kozlowski <[email protected]>
M: Vladimir Zapolskiy <[email protected]>
-M: Kamil Konieczny <[email protected]>
+M: Kamil Konieczny <[email protected]>
S: Maintained