aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS32
-rw-r--r--drivers/soc/samsung/exynos-chipid.c2
3 files changed, 18 insertions, 17 deletions
diff --git a/.mailmap b/.mailmap
index 10ee1103c823..b96b98a2d9de 100644
--- a/.mailmap
+++ b/.mailmap
@@ -216,6 +216,7 @@ Koushik <[email protected]>
Krishna Manikandan <[email protected]> <[email protected]>
Krzysztof Kozlowski <[email protected]> <[email protected]>
Krzysztof Kozlowski <[email protected]> <[email protected]>
+Krzysztof Kozlowski <[email protected]> <[email protected]>
Kuninori Morimoto <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 1ba1e4af2cbc..a84bd0855d67 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2572,7 +2572,7 @@ F: sound/soc/rockchip/
N: rockchip
ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
-M: Krzysztof Kozlowski <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
R: Alim Akhtar <[email protected]>
L: [email protected] (moderated for non-subscribers)
@@ -11675,7 +11675,7 @@ F: drivers/iio/proximity/mb1232.c
MAXIM MAX17040 FAMILY FUEL GAUGE DRIVERS
R: Iskren Chernev <[email protected]>
-R: Krzysztof Kozlowski <[email protected]>
+R: Krzysztof Kozlowski <[email protected]>
R: Marek Szyprowski <[email protected]>
R: Matheus Castello <[email protected]>
@@ -11685,7 +11685,7 @@ F: drivers/power/supply/max17040_battery.c
MAXIM MAX17042 FAMILY FUEL GAUGE DRIVERS
R: Hans de Goede <[email protected]>
-R: Krzysztof Kozlowski <[email protected]>
+R: Krzysztof Kozlowski <[email protected]>
R: Marek Szyprowski <[email protected]>
R: Sebastian Krzyszkowiak <[email protected]>
R: Purism Kernel Team <[email protected]>
@@ -11730,7 +11730,7 @@ F: Documentation/devicetree/bindings/power/supply/maxim,max77976.yaml
F: drivers/power/supply/max77976_charger.c
MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
-M: Krzysztof Kozlowski <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
M: Bartlomiej Zolnierkiewicz <[email protected]>
S: Supported
@@ -11739,7 +11739,7 @@ F: drivers/power/supply/max77693_charger.c
MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
M: Chanwoo Choi <[email protected]>
-M: Krzysztof Kozlowski <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
M: Bartlomiej Zolnierkiewicz <[email protected]>
S: Supported
@@ -12428,7 +12428,7 @@ F: include/linux/memblock.h
F: mm/memblock.c
MEMORY CONTROLLER DRIVERS
-M: Krzysztof Kozlowski <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
@@ -13565,7 +13565,7 @@ F: include/uapi/linux/nexthop.h
F: net/ipv4/nexthop.c
NFC SUBSYSTEM
-M: Krzysztof Kozlowski <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
L: [email protected] (subscribers-only)
S: Maintained
@@ -13879,7 +13879,7 @@ F: Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
F: drivers/regulator/pf8x00-regulator.c
NXP PTN5150A CC LOGIC AND EXTCON DRIVER
-M: Krzysztof Kozlowski <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
S: Maintained
F: Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
@@ -15305,7 +15305,7 @@ F: drivers/pinctrl/renesas/
PIN CONTROLLER - SAMSUNG
M: Tomasz Figa <[email protected]>
-M: Krzysztof Kozlowski <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
M: Sylwester Nawrocki <[email protected]>
R: Alim Akhtar <[email protected]>
L: [email protected] (moderated for non-subscribers)
@@ -16947,7 +16947,7 @@ W: http://www.ibm.com/developerworks/linux/linux390/
F: drivers/s390/scsi/zfcp_*
S3C ADC BATTERY DRIVER
-M: Krzysztof Kozlowski <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
S: Odd Fixes
F: drivers/power/supply/s3c_adc_battery.c
@@ -16992,7 +16992,7 @@ F: Documentation/admin-guide/LSM/SafeSetID.rst
F: security/safesetid/
SAMSUNG AUDIO (ASoC) DRIVERS
-M: Krzysztof Kozlowski <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
M: Sylwester Nawrocki <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Supported
@@ -17000,7 +17000,7 @@ F: Documentation/devicetree/bindings/sound/samsung*
F: sound/soc/samsung/
SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER
-M: Krzysztof Kozlowski <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
S: Maintained
@@ -17035,7 +17035,7 @@ S: Maintained
F: drivers/platform/x86/samsung-laptop.c
SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
-M: Krzysztof Kozlowski <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
M: Bartlomiej Zolnierkiewicz <[email protected]>
@@ -17061,7 +17061,7 @@ F: drivers/media/platform/s3c-camif/
F: include/media/drv-intf/s3c_camif.h
SAMSUNG S3FWRN5 NFC DRIVER
-M: Krzysztof Kozlowski <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
M: Krzysztof Opasiak <[email protected]>
L: [email protected] (subscribers-only)
S: Maintained
@@ -17083,7 +17083,7 @@ S: Supported
F: drivers/media/i2c/s5k5baf.c
SAMSUNG S5P Security SubSystem (SSS) DRIVER
-M: Krzysztof Kozlowski <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
M: Vladimir Zapolskiy <[email protected]>
@@ -17118,7 +17118,7 @@ F: include/linux/clk/samsung.h
F: include/linux/platform_data/clk-s3c2410.h
SAMSUNG SPI DRIVERS
-M: Krzysztof Kozlowski <[email protected]>
+M: Krzysztof Kozlowski <[email protected]>
M: Andi Shyti <[email protected]>
diff --git a/drivers/soc/samsung/exynos-chipid.c b/drivers/soc/samsung/exynos-chipid.c
index 2746d05936d3..0fb3631e7346 100644
--- a/drivers/soc/samsung/exynos-chipid.c
+++ b/drivers/soc/samsung/exynos-chipid.c
@@ -204,7 +204,7 @@ module_platform_driver(exynos_chipid_driver);
MODULE_DESCRIPTION("Samsung Exynos ChipID controller and ASV driver");
MODULE_AUTHOR("Bartlomiej Zolnierkiewicz <[email protected]>");
-MODULE_AUTHOR("Krzysztof Kozlowski <[email protected]>");
+MODULE_AUTHOR("Krzysztof Kozlowski <[email protected]>");
MODULE_AUTHOR("Pankaj Dubey <[email protected]>");
MODULE_AUTHOR("Sylwester Nawrocki <[email protected]>");
MODULE_LICENSE("GPL");