[PATCH] doc: sl-mx8mm: Fix mistake in merge conflict resolution

sbabic at denx.de sbabic at denx.de
Thu Mar 30 10:43:53 CEST 2023


> From: Frieder Schrempf <frieder.schrempf at kontron.de>
> There was a conflict between the following two commits, that wasn't
> resolved correctly. Fix this.
> a93985ddfcc3 ("doc: sl-mx8mm: Update the NXP TF-A source reference")
> f0f461287eff ("imx: Suggest the NXP ATF github repo")
> Signed-off-by: Frieder Schrempf <frieder.schrempf at kontron.de>
> Cc: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>
> Cc: Fabio Estevam <festevam at denx.de>
> Cc: Stefano Babic <sbabic at denx.de>
> Reviewed-by: Fabio Estevam <festevam at denx.de>
Applied to u-boot-imx, next, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,        Managing Director: Erika Unter  
HRB 165235 Munich,   Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================


More information about the U-Boot mailing list