Frieder Schrempf db869a2785 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. a93985ddfc ("doc: sl-mx8mm: Update the NXP TF-A source reference") f0f461287e ("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>		2023-03-30 08:40:27 +02:00
..
index.rst	board: kontron: pitx-imx8m: Add Kontron pitx-imx8m board support	2022-02-05 15:49:02 +01:00
pitx-imx8m.rst	board: kontron: pitx-imx8m: Add Kontron pitx-imx8m board support	2022-02-05 15:49:02 +01:00
sl-mx6ul.rst	imx: imx6ul: Add support for Kontron Electronics SL/BL i.MX6UL/ULL boards (N63xx/N64xx)	2021-10-07 16:53:50 +02:00
sl-mx8mm.rst	doc: sl-mx8mm: Fix mistake in merge conflict resolution	2023-03-30 08:40:27 +02:00
sl28.rst	board: sl28: remove "Useful I2C tricks" section from docs	2022-02-28 11:59:35 +05:30