The single file conflict below is actually trivial. Conflicts: board/boundary/nitrogen6x/nitrogen6x.c |
||
---|---|---|
.. | ||
cpu | ||
dts | ||
imx-common | ||
include/asm | ||
lib | ||
Kconfig | ||
config.mk |
The single file conflict below is actually trivial. Conflicts: board/boundary/nitrogen6x/nitrogen6x.c |
||
---|---|---|
.. | ||
cpu | ||
dts | ||
imx-common | ||
include/asm | ||
lib | ||
Kconfig | ||
config.mk |