From: Jiang Jiang Jian <jack@espressif.com>
Date: Mon, 2 Apr 2018 14:20:31 +0000 (+0800)
Subject: Merge branch 'feature/wifi_bt_new_coex' into 'master'
X-Git-Tag: v3.1-beta1~298
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7133e14eee1f0fe26ee3443ecd6330360dba0c9a;p=esp-idf

Merge branch 'feature/wifi_bt_new_coex' into 'master'

Feature/wifi bt new coex

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

7133e14eee1f0fe26ee3443ecd6330360dba0c9a