From: Olof Johansson <olof@lixom.net>
Date: Sat, 2 Jun 2018 08:16:49 +0000 (-0700)
Subject: Merge tag 'imx-maintainers-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.19~809^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ffd831a3fc0bebacfbd0f4735345e4c350291e38;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'imx-maintainers-4.18' of git://git./linux/kernel/git/shawnguo/linux into next/soc

i.MX maintainers update for 4.18:
 - Add NXP linux team as a reviewer for i.MX platform support.

* tag 'imx-maintainers-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  MAINTAINERS: add NXP linux team maillist as i.MX reviewer
---

ffd831a3fc0bebacfbd0f4735345e4c350291e38
diff --cc MAINTAINERS
index 58b9861,1defbc8..10cfa0d
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1404,9 -1401,9 +1404,10 @@@ F:	arch/arm/mach-footbridge
  
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
  M:	Shawn Guo <shawnguo@kernel.org>
 -M:	Sascha Hauer <kernel@pengutronix.de>
 +M:	Sascha Hauer <s.hauer@pengutronix.de>
 +R:	Pengutronix Kernel Team <kernel@pengutronix.de>
  R:	Fabio Estevam <fabio.estevam@nxp.com>
+ R:	NXP Linux Team <linux-imx@nxp.com>
  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