mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-12 14:23:00 +00:00
4b19b7448e
The single file conflict below is actually trivial. Conflicts: board/boundary/nitrogen6x/nitrogen6x.c |
||
---|---|---|
.. | ||
imximage.cfg | ||
Kconfig | ||
MAINTAINERS | ||
Makefile | ||
vf610twr.c |