mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-03-04 15:27:19 +00:00
The single file conflict below is actually trivial. Conflicts: board/boundary/nitrogen6x/nitrogen6x.c |
||
---|---|---|
.. | ||
Kconfig | ||
MAINTAINERS | ||
Makefile | ||
mx6dlsabresd.cfg | ||
mx6q_4x_mt41j128.cfg | ||
mx6sabresd.c |