Unverified Commit 9d24a733 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX MAINTAINERS changes for 6.20:

- Shawn Guo steps down and Frank Li steps up as i.MX platform
  maintainer

* tag 'imx-maintainers-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  MAINTAINERS: Replace Shawn with Frank as i.MX platform maintainer

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 63804fed 473dd9ec

MAINTAINERS

+7 −7
Original line number Diff line number Diff line
@@ -2747,14 +2747,14 @@ F: arch/arm/include/asm/hardware/dec21285.h 
F:	arch/arm/mach-footbridge/









ARM/FREESCALE IMX / MXC ARM ARCHITECTURE









M:	Shawn Guo <shawnguo@kernel.org>









M:	Frank Li <Frank.Li@nxp.com>









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









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









R:	Fabio Estevam <festevam@gmail.com>









L:	imx@lists.linux.dev









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









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git









F:	Documentation/devicetree/bindings/firmware/fsl*









F:	Documentation/devicetree/bindings/firmware/nxp*









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








@@ -2769,22 +2769,22 @@ N:	mxs







N:	\bmxc[^\d]

















ARM/FREESCALE LAYERSCAPE ARM ARCHITECTURE









M:	Shawn Guo <shawnguo@kernel.org>









M:	Frank Li <Frank.Li@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









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git









F:	arch/arm/boot/dts/nxp/ls/









F:	arch/arm64/boot/dts/freescale/fsl-*









F:	arch/arm64/boot/dts/freescale/qoriq-*

















ARM/FREESCALE VYBRID ARM ARCHITECTURE









M:	Shawn Guo <shawnguo@kernel.org>









M:	Frank Li <Frank.Li@nxp.com>









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









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









R:	Stefan Agner <stefan@agner.ch>









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









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git









F:	arch/arm/boot/dts/nxp/vf/









F:	arch/arm/mach-imx/*vf610*
















@@ -20578,7 +20578,7 @@ F:	drivers/pinctrl/pinctrl-amd.c







PIN CONTROLLER - FREESCALE









M:	Dong Aisheng <aisheng.dong@nxp.com>









M:	Fabio Estevam <festevam@gmail.com>









M:	Shawn Guo <shawnguo@kernel.org>









M:	Frank Li <Frank.Li@nxp.com>









M:	Jacky Bai <ping.bai@nxp.com>









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









R:	NXP S32 Linux Team <s32@nxp.com>