On 08/02/2023 13:20, Frieder Schrempf wrote:
From: Frieder Schrempf <frieder.schre...@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.schre...@kontron.de> Cc: Heinrich Schuchardt <heinrich.schucha...@canonical.com> Cc: Fabio Estevam <feste...@denx.de> Cc: Stefano Babic <sba...@denx.de>
Reviewed-by: Fabio Estevam <feste...@denx.de>
