From mboxrd@z Thu Jan  1 00:00:00 1970
From: olof@lixom.net (Olof Johansson)
Date: Fri, 4 Jul 2014 21:52:22 -0700
Subject: [PATCH] MAINTAINERS: merge MXS entry into IMX one
In-Reply-To: <20140703063142.GL14257@pengutronix.de>
References: <1404286630-9662-1-git-send-email-shawn.guo@freescale.com>
 <20140703063142.GL14257@pengutronix.de>
Message-ID: <20140705045222.GD5201@quad.lixom.net>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Thu, Jul 03, 2014 at 08:31:42AM +0200, Sascha Hauer wrote:
> On Wed, Jul 02, 2014 at 03:37:10PM +0800, Shawn Guo wrote:
> > 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 <shawn.guo@freescale.com>
> 
> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

Applied to fixes.


-Olof