From: Wangjialin <wangjialin@espressif.com>
Date: Wed, 16 Nov 2016 06:51:36 +0000 (+0800)
Subject: Merge branch 'master' into bugfix/uart_isr_switch_context
X-Git-Tag: v1.0~54^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13b81debb373efb116564fd542cdc09b86176479;p=esp-idf

Merge branch 'master' into bugfix/uart_isr_switch_context
---

13b81debb373efb116564fd542cdc09b86176479