From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751741AbcI3MOt (ORCPT ); Fri, 30 Sep 2016 08:14:49 -0400 Received: from foss.arm.com ([217.140.101.70]:41698 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932230AbcI3MOj (ORCPT ); Fri, 30 Sep 2016 08:14:39 -0400 From: Javi Merino To: Linus Torvalds , Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Zhang Rui , Eduardo Valentin , javi.merino@kernel.org, Javi Merino Subject: [PATCH] MAINTAINERS: Switch to kernel.org email address for Javi Merino Date: Fri, 30 Sep 2016 13:14:28 +0100 Message-Id: <1475237668-8408-1-git-send-email-javi.merino@arm.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Change my email address to my kernel.org account instead of the ARM one. Signed-off-by: Javi Merino --- .mailmap | 1 + MAINTAINERS | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index de22daefd9da..1dab0a156489 100644 --- a/.mailmap +++ b/.mailmap @@ -69,6 +69,7 @@ James Bottomley James Bottomley James E Wilson James Ketrenos +Javi Merino Jean Tourrilhes Jeff Garzik 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 M: Viresh Kumar -M: Javi Merino +M: Javi Merino L: linux-pm@vger.kernel.org S: Supported F: Documentation/thermal/cpu-cooling-api.txt -- 1.9.1