]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'master' into bugfix/uart_isr_switch_context
authorWangjialin <wangjialin@espressif.com>
Wed, 16 Nov 2016 09:11:18 +0000 (17:11 +0800)
committerWangjialin <wangjialin@espressif.com>
Wed, 16 Nov 2016 09:11:18 +0000 (17:11 +0800)

Trivial merge