From: Jeroen Domburg <git@j0h.nl>
Date: Wed, 26 Oct 2016 03:04:42 +0000 (+0800)
Subject: Merge in master updates
X-Git-Tag: v1.0~100^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f96b239897b8e8d21f82f72b8c5ef18bc52d135;p=esp-idf

Merge in master updates
---

6f96b239897b8e8d21f82f72b8c5ef18bc52d135
diff --cc components/esp32/cpu_start.c
index 51f6cebb2b,5c7a411c8e..aecea66ef9
--- a/components/esp32/cpu_start.c
+++ b/components/esp32/cpu_start.c
@@@ -43,9 -43,7 +43,10 @@@
  #include "esp_ipc.h"
  #include "esp_log.h"
  
 +#include "esp_brownout.h"
 +#include "esp_int_wdt.h"
 +#include "esp_task_wdt.h"
+ #include "trax.h"
  
  void start_cpu0(void) __attribute__((weak, alias("start_cpu0_default")));
  void start_cpu0_default(void) IRAM_ATTR;