linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] MAINTAINERS: merge MXS entry into IMX one
@ 2014-07-02  7:37 Shawn Guo
  2014-07-03  6:31 ` Sascha Hauer
  0 siblings, 1 reply; 3+ messages in thread
From: Shawn Guo @ 2014-07-02  7:37 UTC (permalink / raw)
  To: linux-arm-kernel

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>
---
 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 at 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 <shawn.guo@linaro.org>
-L:	linux-arm-kernel at 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 <kernel@wantstofly.org>
 L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH] MAINTAINERS: merge MXS entry into IMX one
  2014-07-02  7:37 [PATCH] MAINTAINERS: merge MXS entry into IMX one Shawn Guo
@ 2014-07-03  6:31 ` Sascha Hauer
  2014-07-05  4:52   ` Olof Johansson
  0 siblings, 1 reply; 3+ messages in thread
From: Sascha Hauer @ 2014-07-03  6:31 UTC (permalink / raw)
  To: linux-arm-kernel

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>

Sascha

> ---
>  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 at 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 <shawn.guo@linaro.org>
> -L:	linux-arm-kernel at 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 <kernel@wantstofly.org>
>  L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
> -- 
> 1.8.3.2
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] MAINTAINERS: merge MXS entry into IMX one
  2014-07-03  6:31 ` Sascha Hauer
@ 2014-07-05  4:52   ` Olof Johansson
  0 siblings, 0 replies; 3+ messages in thread
From: Olof Johansson @ 2014-07-05  4:52 UTC (permalink / raw)
  To: linux-arm-kernel

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-07-05  4:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-02  7:37 [PATCH] MAINTAINERS: merge MXS entry into IMX one Shawn Guo
2014-07-03  6:31 ` Sascha Hauer
2014-07-05  4:52   ` Olof Johansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).