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: 9358115 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DA9866077B for ; Fri, 30 Sep 2016 12:14:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCA6929FE7 for ; Fri, 30 Sep 2016 12:14:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C158A29FE9; Fri, 30 Sep 2016 12:14:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C3F129FE8 for ; Fri, 30 Sep 2016 12:14:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932400AbcI3MOj (ORCPT ); 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 X-Virus-Scanned: ClamAV using ClamSMTP 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