From: Ivan Grokhotkov <ivan@espressif.com>
Date: Tue, 12 Sep 2017 04:10:54 +0000 (+0800)
Subject: Merge branch 'bugfix/list_node_naming' into 'master'
X-Git-Tag: v3.1-dev~288
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=868b0ce228e6e09aa22de02de954e40734034d5d;p=esp-idf

Merge branch 'bugfix/list_node_naming' into 'master'

Fix "list_node" name conflict in bluedroid & dhcp_server

See merge request !1216
---

868b0ce228e6e09aa22de02de954e40734034d5d