From: Ivan Grokhotkov <ivan@espressif.com>
Date: Tue, 3 Apr 2018 07:19:10 +0000 (+0800)
Subject: Merge branch 'feature/deactivate_wakeup_trigger' into 'master'
X-Git-Tag: v3.1-beta1~295
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=139d49894c473bd34ab6e9515e85d3f6871a30c7;p=esp-idf

Merge branch 'feature/deactivate_wakeup_trigger' into 'master'

esp32: Add deactivation of wake up trigger for different sources

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

139d49894c473bd34ab6e9515e85d3f6871a30c7