git.dujemihanovic.xyz Git - u-boot.git/commit

author	Frieder Schrempf <frieder.schrempf@kontron.de>
	Wed, 8 Feb 2023 16:20:33 +0000 (17:20 +0100)
committer	Stefano Babic <sbabic@denx.de>
	Thu, 30 Mar 2023 06:40:27 +0000 (08:40 +0200)
commit	db869a278526020779cf1c855c353e92ba31733c
tree	267bc8fa0e044c294c21ca1b3aa354de1ff1e0ce	tree \| snapshot
parent	7e32871ce4d17aa549d44f0e50434b5c6454d184	commit \| diff

doc: sl-mx8mm: Fix mistake in merge conflict resolution

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@kontron.de>
Cc: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Cc: Fabio Estevam <festevam@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Reviewed-by: Fabio Estevam <festevam@denx.de>