From: Jiang Jiang Jian <jack@espressif.com>
Date: Thu, 15 Jun 2017 12:45:57 +0000 (+0800)
Subject: Merge branch 'bugfix/intrrupt_num_conflict' into 'master'
X-Git-Tag: v2.1-rc1~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe1f8a25b5feff39c9d0d8a31886ee64a6d658f6;p=esp-idf

Merge branch 'bugfix/intrrupt_num_conflict' into 'master'

component/bt : fix interrupt number conflict

See merge request !878
---

fe1f8a25b5feff39c9d0d8a31886ee64a6d658f6