From patchwork Wed Jul 2 07:37:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 4463841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 52AF6BEEAA for ; Wed, 2 Jul 2014 07:41:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5F4E520222 for ; Wed, 2 Jul 2014 07:41:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 928CD20172 for ; Wed, 2 Jul 2014 07:41:33 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X2F6u-0003Ws-DU; Wed, 02 Jul 2014 07:37:44 +0000 Received: from mail-bn1blp0183.outbound.protection.outlook.com ([207.46.163.183] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X2F6r-0003Uz-8a for linux-arm-kernel@lists.infradead.org; Wed, 02 Jul 2014 07:37:42 +0000 Received: from BLUPR03CA033.namprd03.prod.outlook.com (10.141.30.26) by BL2PR03MB337.namprd03.prod.outlook.com (10.141.68.16) with Microsoft SMTP Server (TLS) id 15.0.980.8; Wed, 2 Jul 2014 07:37:19 +0000 Received: from BL2FFO11FD037.protection.gbl (2a01:111:f400:7c09::140) by BLUPR03CA033.outlook.office365.com (2a01:111:e400:879::26) with Microsoft SMTP Server (TLS) id 15.0.985.8 via Frontend Transport; Wed, 2 Jul 2014 07:37:18 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD037.mail.protection.outlook.com (10.173.161.133) with Microsoft SMTP Server (TLS) id 15.0.969.12 via Frontend Transport; Wed, 2 Jul 2014 07:37:18 +0000 Received: from dragon.ap.freescale.net ([10.192.185.81]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s627bEBU024580; Wed, 2 Jul 2014 00:37:16 -0700 From: Shawn Guo To: Subject: [PATCH] MAINTAINERS: merge MXS entry into IMX one Date: Wed, 2 Jul 2014 15:37:10 +0800 Message-ID: <1404286630-9662-1-git-send-email-shawn.guo@freescale.com> X-Mailer: git-send-email 1.8.3.2 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(6009001)(199002)(189002)(88136002)(4396001)(64706001)(95666004)(85306003)(62966002)(77156001)(50226001)(50466002)(97736001)(26826002)(92726001)(47776003)(92566001)(46102001)(105606002)(89996001)(106466001)(80022001)(81156004)(85852003)(107046002)(68736004)(2351001)(229853001)(74662001)(83322001)(83072002)(76482001)(87936001)(69596002)(79102001)(19580405001)(50986999)(44976005)(104166001)(93916002)(102836001)(84676001)(81542001)(81342001)(104016002)(87286001)(48376002)(21056001)(6806004)(36756003)(86362001)(74502001)(33646001)(31966008)(99396002)(19580395003)(77982001)(20776003); DIR:OUT; SFP:; SCL:1; SRVR:BL2PR03MB337; H:az84smr01.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID: X-Forefront-PRVS: 0260457E99 Received-SPF: Fail (: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=Shawn.Guo@freescale.com; X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140702_003741_455210_9EE5092A X-CRM114-Status: UNSURE ( 5.88 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: Shawn Guo , linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The mach-mxs platform is actually co-maintained by myself and pengutronix folks. Also it's hosted in the same kernel tree as IMX. So let's merge the entry into IMX one. Signed-off-by: Shawn Guo Acked-by: Sascha Hauer --- MAINTAINERS | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 134483f206e4..161762e40b85 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -943,16 +943,10 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git F: arch/arm/mach-imx/ +F: arch/arm/mach-mxs/ F: arch/arm/boot/dts/imx* F: arch/arm/configs/imx*_defconfig -ARM/FREESCALE MXS ARM ARCHITECTURE -M: Shawn Guo -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -T: git git://git.linaro.org/people/shawnguo/linux-2.6.git -F: arch/arm/mach-mxs/ - ARM/GLOMATION GESBC9312SX MACHINE SUPPORT M: Lennert Buytenhek L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)