From patchwork Fri Sep 30 12:14:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javi Merino X-Patchwork-Id: 77171 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp252602qgf; Fri, 30 Sep 2016 05:14:48 -0700 (PDT) X-Received: by 10.98.34.66 with SMTP id i63mr11173068pfi.130.1475237688831; Fri, 30 Sep 2016 05:14:48 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v27si19928582pfi.47.2016.09.30.05.14.48; Fri, 30 Sep 2016 05:14:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932400AbcI3MOj (ORCPT + 14 others); Fri, 30 Sep 2016 08:14:39 -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 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1032329; Fri, 30 Sep 2016 05:14:38 -0700 (PDT) Received: from e104805-lin.cambridge.arm.com (e104805-lin.cambridge.arm.com [10.1.210.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BF4773F251; Fri, 30 Sep 2016 05:14:36 -0700 (PDT) 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-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@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(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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