mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-04 02:20:43 +09:00
4b19b7448e
The single file conflict below is actually trivial. Conflicts: board/boundary/nitrogen6x/nitrogen6x.c |
||
---|---|---|
.. | ||
imximage.cfg | ||
Kconfig | ||
MAINTAINERS | ||
Makefile | ||
mx6dl.cfg | ||
mx6qsabreauto.c |