From: Ivan Grokhotkov <ivan@espressif.com>
Date: Sun, 22 Oct 2017 04:34:11 +0000 (+0800)
Subject: Merge branch 'feature/dfs' into 'master'
X-Git-Tag: v3.1-dev~144
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=59b7d98fec9ee2758e8217f17bca5e75eee78965;p=esp-idf

Merge branch 'feature/dfs' into 'master'

Dynamic frequency scaling

See merge request !1189
---

59b7d98fec9ee2758e8217f17bca5e75eee78965
diff --cc docs/api-reference/system/index.rst
index e5f457f619,d4f08528d8..a4c348170b
--- a/docs/api-reference/system/index.rst
+++ b/docs/api-reference/system/index.rst
@@@ -8,9 -8,9 +8,10 @@@ System AP
     Heap Memory Debugging <heap_debug>
     Interrupt Allocation <intr_alloc>
     Watchdogs <wdts>
 +   Hooks <hooks>
     Over The Air Updates (OTA) <ota>
     Sleep Modes <sleep_modes>
+    Power Management <power_management>
     Logging <log>
     Base MAC address <base_mac_address>
     Application Level Tracing <app_trace>