From: Wangjialin <wangjialin@espressif.com>
Date: Thu, 10 Nov 2016 03:57:19 +0000 (+0800)
Subject: Merge branch 'master' into driver_merge_tmp/merge_uart
X-Git-Tag: v1.0~67^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6fb2515a5db502ef3ae4aa4fc2aa1342e81667d0;p=esp-idf

Merge branch 'master' into driver_merge_tmp/merge_uart

# Conflicts:
#	components/esp32/include/esp_err.h
---

6fb2515a5db502ef3ae4aa4fc2aa1342e81667d0