Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e62538ff authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-maintainers-5.1' of... 

Merge tag 'imx-maintainers-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX MAINTAINERS update for 5.1:
 - Add all files matching "imx" and "mxs" to the IMX entry, so that we
   can get copied on all IMX related changes without explicitly listing
   so many files and folders.
 - Update Fabio's email address.

* tag 'imx-maintainers-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  MAINTAINERS: imx: Change Fabio's email address
  MAINTAINERS: add all files matching "imx" and "mxs" to the IMX entry
parents d2a4f1ba 17ffc119

MAINTAINERS

+4 −11
Original line number Diff line number Diff line
@@ -1531,21 +1531,14 @@ ARM/FREESCALE IMX / MXC ARM ARCHITECTURE 
M:	Shawn Guo <shawnguo@kernel.org>

M:	Sascha Hauer <s.hauer@pengutronix.de>

R:	Pengutronix Kernel Team <kernel@pengutronix.de>

R:	Fabio Estevam <fabio.estevam@nxp.com>

R:	Fabio Estevam <festevam@gmail.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

F:	arch/arm/mach-imx/

F:	arch/arm/mach-mxs/

F:	arch/arm/boot/dts/imx*

F:	arch/arm/configs/imx*_defconfig

F:	arch/arm64/boot/dts/freescale/imx*

F:	drivers/clk/imx/

F:	drivers/firmware/imx/

F:	drivers/soc/imx/

F:	include/linux/firmware/imx/

F:	include/soc/imx/

N:	imx

N:	mxs

X:	drivers/media/i2c/



ARM/FREESCALE VYBRID ARM ARCHITECTURE

M:	Shawn Guo <shawnguo@kernel.org>