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

Fabio Estevam festevam at denx.de
Wed Feb 8 17:28:14 CET 2023

On 08/02/2023 13:20, Frieder Schrempf wrote:
> 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>

More information about the U-Boot mailing list