MAINTAINERS, mailmap: Change Ulf Hansson's email

Change my email in MAINTAINERS and add a few entries in mailmap to start
using ulfh@kernel.org.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/.mailmap b/.mailmap
index 2d04aeba68b40b7430d42a6cb0ca8f692afd4f9d..22c5ab1c5d55cb2de8fe085bb3b9c60197d96da9 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -849,6 +849,8 @@ Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko.ursulin@onelan.co.uk>
 Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko@ursulin.net>
 Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
 Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
+Ulf Hansson <ulfh@kernel.org> <ulf.hansson@linaro.org>
+Ulf Hansson <ulfh@kernel.org> <ulf.hansson@stericsson.com>
 Umang Jain <uajain@igalia.com> <umang.jain@ideasonboard.com>
 Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
 Uwe Kleine-König <u.kleine-koenig@baylibre.com> <ukleinek@baylibre.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index c3fe46d7c4bc43e960282537a7d89fd4c34080f7..7167dcea737d615b66ef49552b8ba445525ebc60 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6716,7 +6716,7 @@ F:        include/linux/platform_data/cpuidle-exynos.h
 CPUIDLE DRIVER - ARM PSCI
 M:     Lorenzo Pieralisi <lpieralisi@kernel.org>
 M:     Sudeep Holla <sudeep.holla@kernel.org>
-M:     Ulf Hansson <ulf.hansson@linaro.org>
+M:     Ulf Hansson <ulfh@kernel.org>
 L:     linux-pm@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
@@ -6724,7 +6724,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
 F:     drivers/cpuidle/cpuidle-psci.c
 
 CPUIDLE DRIVER - ARM PSCI PM DOMAIN
-M:     Ulf Hansson <ulf.hansson@linaro.org>
+M:     Ulf Hansson <ulfh@kernel.org>
 L:     linux-pm@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
@@ -6733,7 +6733,7 @@ F:        drivers/cpuidle/cpuidle-psci-domain.c
 F:     drivers/cpuidle/cpuidle-psci.h
 
 CPUIDLE DRIVER - DT IDLE PM DOMAIN
-M:     Ulf Hansson <ulf.hansson@linaro.org>
+M:     Ulf Hansson <ulfh@kernel.org>
 L:     linux-pm@vger.kernel.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
@@ -10729,7 +10729,7 @@ F:      Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.yaml
 F:     drivers/i2c/muxes/i2c-demux-pinctrl.c
 
 GENERIC PM DOMAINS
-M:     Ulf Hansson <ulf.hansson@linaro.org>
+M:     Ulf Hansson <ulfh@kernel.org>
 L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/power/power?domain*
@@ -18089,7 +18089,7 @@ F:      drivers/mmc/host/mmc_spi.c
 F:     include/linux/spi/mmc_spi.h
 
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
-M:     Ulf Hansson <ulf.hansson@linaro.org>
+M:     Ulf Hansson <ulfh@kernel.org>
 L:     linux-mmc@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
@@ -24696,7 +24696,7 @@ F:      drivers/media/i2c/imx415.c
 SONY MEMORYSTICK SUBSYSTEM
 M:     Maxim Levitsky <maximlevitsky@gmail.com>
 M:     Alex Dubov <oakad@yahoo.com>
-M:     Ulf Hansson <ulf.hansson@linaro.org>
+M:     Ulf Hansson <ulfh@kernel.org>
 L:     linux-mmc@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
@@ -27615,7 +27615,7 @@ F:      Documentation/fb/uvesafb.rst
 F:     drivers/video/fbdev/uvesafb.*
 
 Ux500 CLOCK DRIVERS
-M:     Ulf Hansson <ulf.hansson@linaro.org>
+M:     Ulf Hansson <ulfh@kernel.org>
 L:     linux-clk@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained