> From: Frieder Schrempf <[email protected]> > 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 <[email protected]> > Cc: Heinrich Schuchardt <[email protected]> > Cc: Fabio Estevam <[email protected]> > Cc: Stefano Babic <[email protected]> > Reviewed-by: Fabio Estevam <[email protected]> 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: [email protected] =====================================================================
