From: Ivan Grokhotkov <ivan@espressif.com>
Date: Fri, 20 Apr 2018 06:55:47 +0000 (+0800)
Subject: Merge branch 'feature/amazon_freertos_compat_v2' into 'master'
X-Git-Tag: v3.1-beta1~238
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22fbcd276c90049b906702fde1744fd24d438be3;p=esp-idf

Merge branch 'feature/amazon_freertos_compat_v2' into 'master'

Changes for Amazon Freertos compatibility

See merge request idf/esp-idf!2123
---

22fbcd276c90049b906702fde1744fd24d438be3