| Message ID | 1329142226-2685-1-git-send-email-shawn.guo@linaro.org |
|---|---|
| State | Accepted |
| Commit | ff0ea1ee058e3906502452eba60fd220ece4401d |
| Headers | show |
On Mon, Feb 13, 2012 at 06:10:26AM -0800, Shawn Guo wrote: > With commit 784a90c0a7d8f5 ("ARM i.MX: Merge i.MX5 support into > mach-imx") merging mach-mx5 into mach-imx, arch/arm/mach-mx* only > covers mach-mxs now. Since we already have a separate MXS entry > for arch/arm/mach-mxs, arch/arm/mach-mx* can simply be removed there. > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > Cc: Sascha Hauer <kernel@pengutronix.de> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> > --- > MAINTAINERS | 1 - > 1 files changed, 0 insertions(+), 1 deletions(-) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 55ca0be..37169f5 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -785,7 +785,6 @@ M: Sascha Hauer <kernel@pengutronix.de> > L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) > S: Maintained > T: git git://git.pengutronix.de/git/imx/linux-2.6.git > -F: arch/arm/mach-mx*/ > F: arch/arm/mach-imx/ > F: arch/arm/plat-mxc/ > > -- > 1.7.5.4 > >
diff --git a/MAINTAINERS b/MAINTAINERS index 55ca0be..37169f5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -785,7 +785,6 @@ M: Sascha Hauer <kernel@pengutronix.de> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained T: git git://git.pengutronix.de/git/imx/linux-2.6.git -F: arch/arm/mach-mx*/ F: arch/arm/mach-imx/ F: arch/arm/plat-mxc/
With commit 784a90c0a7d8f5 ("ARM i.MX: Merge i.MX5 support into mach-imx") merging mach-mx5 into mach-imx, arch/arm/mach-mx* only covers mach-mxs now. Since we already have a separate MXS entry for arch/arm/mach-mxs, arch/arm/mach-mx* can simply be removed there. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Sascha Hauer <kernel@pengutronix.de> --- MAINTAINERS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)