Conflicts: arch/arm/cpu/arm926ejs/mxs/Makefile include/configs/trats.h include/configs/trats2.h include/mmc.h |
||
|---|---|---|
| .. | ||
| Makefile | ||
| dfu.c | ||
| dfu_mmc.c | ||
| dfu_nand.c | ||
| dfu_ram.c | ||
Conflicts: arch/arm/cpu/arm926ejs/mxs/Makefile include/configs/trats.h include/configs/trats2.h include/mmc.h |
||
|---|---|---|
| .. | ||
| Makefile | ||
| dfu.c | ||
| dfu_mmc.c | ||
| dfu_nand.c | ||
| dfu_ram.c | ||