From: Xia Xiao Tian <xiaxiaotian@espressif.com>
Date: Mon, 21 Nov 2016 01:45:31 +0000 (+0800)
Subject: Merge branch 'master' into feature/modem_sleep
X-Git-Tag: v1.0~15^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39e924b664bc3f2a5f03e33dc166bbda2a7bc1ad;p=esp-idf

Merge branch 'master' into feature/modem_sleep
---

39e924b664bc3f2a5f03e33dc166bbda2a7bc1ad
diff --cc components/esp32/lib
index a580f70a64,ea9c156e8a..3ee7a22306
--- a/components/esp32/lib
+++ b/components/esp32/lib
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit a580f70a64872a7cc291b1f22455f6adbc2e35cf
 -Subproject commit ea9c156e8a67d27623eab6f98ce5a55a00c8fb19
++Subproject commit 3ee7a22306abf73aa4d270f566b273929de98d60