mirror of
https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git
synced 2026-02-10 22:02:56 +01:00
The single file conflict below is actually trivial. Conflicts: board/boundary/nitrogen6x/nitrogen6x.c |
||
|---|---|---|
| .. | ||
| eth | ||
| gadget | ||
| host | ||
| musb | ||
| musb-new | ||
| phy | ||
| ulpi | ||
| Kconfig | ||