Commit 9a2172a8 authored Sep 30, 2016 by Javi Merino Committed by Linus Torvalds Sep 30, 2016

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>

parent e3b3656c

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -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>

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -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