769ca0d8f8
Conflicts: core/include/esp/rtc_regs.h include/espressif/spi_flash.h |
||
---|---|---|
.. | ||
misc.c | ||
os_cpu_a.c | ||
spi_flash.c | ||
timers.c | ||
uart.c | ||
xtensa_context.S |
769ca0d8f8
Conflicts: core/include/esp/rtc_regs.h include/espressif/spi_flash.h |
||
---|---|---|
.. | ||
misc.c | ||
os_cpu_a.c | ||
spi_flash.c | ||
timers.c | ||
uart.c | ||
xtensa_context.S |