From: Angus Gratton <angus@espressif.com>
Date: Tue, 12 Jun 2018 06:47:34 +0000 (+0800)
Subject: Merge branch 'bugfix/fixes_for_building_with_amazon_freertos' into 'master'
X-Git-Tag: v3.1-beta1~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4eda1b7a2573ef8873b6a969238b87bbf483ed58;p=esp-idf

Merge branch 'bugfix/fixes_for_building_with_amazon_freertos' into 'master'

Fixes for building with amazon freertos

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

4eda1b7a2573ef8873b6a969238b87bbf483ed58