diff options
| author | Javi Merino | 2016-09-30 14:14:28 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-09-30 19:45:11 +0200 |
| commit | 9a2172a8d52cf14ce44e9cadd8c9df84cf832d75 (patch) | |
| tree | bbccf78193273c745021ffa328a4117287e0616f | |
| parent | Merge tag 'drm-fixes-for-v4.8-final' of git://people.freedesktop.org/~airlied... (diff) | |
| download | kernel-qcow2-linux-9a2172a8d52cf14ce44e9cadd8c9df84cf832d75.tar.gz kernel-qcow2-linux-9a2172a8d52cf14ce44e9cadd8c9df84cf832d75.tar.xz kernel-qcow2-linux-9a2172a8d52cf14ce44e9cadd8c9df84cf832d75.zip | |
MAINTAINERS: Switch to kernel.org email address for Javi Merino
Change my email address to my kernel.org account instead of the ARM one.
Signed-off-by: Javi Merino <javi.merino@arm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | MAINTAINERS | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -69,6 +69,7 @@ James Bottomley <jejb@mulgrave.(none)> James Bottomley <jejb@titanic.il.steeleye.com> James E Wilson <wilson@specifix.com> James Ketrenos <jketreno@io.(none)> +Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com> <javier@osg.samsung.com> <javier.martinez@collabora.co.uk> Jean Tourrilhes <jt@hpl.hp.com> Jeff Garzik <jgarzik@pretzel.yyz.us> diff --git a/MAINTAINERS b/MAINTAINERS index b003d0ca6238..f593300e310b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11626,7 +11626,7 @@ F: Documentation/devicetree/bindings/thermal/ THERMAL/CPU_COOLING M: Amit Daniel Kachhap <amit.kachhap@gmail.com> M: Viresh Kumar <viresh.kumar@linaro.org> -M: Javi Merino <javi.merino@arm.com> +M: Javi Merino <javi.merino@kernel.org> L: linux-pm@vger.kernel.org S: Supported F: Documentation/thermal/cpu-cooling-api.txt |