Conflicts: arch/arm/cpu/arm926ejs/mxs/Makefile include/configs/trats.h include/configs/trats2.h include/mmc.h |
||
|---|---|---|
| .. | ||
| Makefile | ||
| cmd_bmode.c | ||
| cmd_hdmidet.c | ||
| cpu.c | ||
| i2c-mxv7.c | ||
| iomux-v3.c | ||
| misc.c | ||
| sata.c | ||
| speed.c | ||
| timer.c | ||
Conflicts: arch/arm/cpu/arm926ejs/mxs/Makefile include/configs/trats.h include/configs/trats2.h include/mmc.h |
||
|---|---|---|
| .. | ||
| Makefile | ||
| cmd_bmode.c | ||
| cmd_hdmidet.c | ||
| cpu.c | ||
| i2c-mxv7.c | ||
| iomux-v3.c | ||
| misc.c | ||
| sata.c | ||
| speed.c | ||
| timer.c | ||