doc: sl-mx8mm: Fix mistake in merge conflict resolution
[platform/kernel/u-boot.git] / doc / sphinx-static /
2019-07-05 Tom RiniMerge tag 'rpi-next-2019.07' of https://github.com...
2019-06-28 Tom RiniMerge tag 'u-boot-imx-20190628' of https://gitlab.denx...
2019-06-21 Tom RiniMerge tag 'efi-2019-07-rc5-3' of https://gitlab.denx...
2019-06-21 Tom RiniMerge branch '2019-06-20-master-imports'
2019-06-20 Breno Matheus Limadoc: Remove duplicated documentation directory