From: Jiang Jiang Jian <jack@espressif.com>
Date: Tue, 20 Mar 2018 12:23:43 +0000 (+0800)
Subject: Merge branch 'cherry-pick-7f2a9f03' into 'master'
X-Git-Tag: v3.1-beta1~333
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd54a35cae290df7def0207db7031644d9729ce4;p=esp-idf

Merge branch 'cherry-pick-7f2a9f03' into 'master'

cherry pick 'bugfix/btdm_fix_reconnect_fail_in_smp_v30' into 'Master'

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

cd54a35cae290df7def0207db7031644d9729ce4