Merge branch 'bugfix/fix_touchpad_wakeup_status' into 'master'

author Ivan Grokhotkov <ivan@espressif.com>

Mon, 23 Jul 2018 20:08:43 +0000 (04:08 +0800)

committer Ivan Grokhotkov <ivan@espressif.com>

Mon, 23 Jul 2018 20:08:43 +0000 (04:08 +0800)
author Ivan Grokhotkov <ivan@espressif.com>
Mon, 23 Jul 2018 20:08:43 +0000 (04:08 +0800)
committer Ivan Grokhotkov <ivan@espressif.com>
Mon, 23 Jul 2018 20:08:43 +0000 (04:08 +0800)
diff --cc components/driver/rtc_module.c
Simple merge
diff --cc components/esp32/sleep_modes.c
Simple merge
author	Ivan Grokhotkov <ivan@espressif.com>
	Mon, 23 Jul 2018 20:08:43 +0000 (04:08 +0800)
committer	Ivan Grokhotkov <ivan@espressif.com>
	Mon, 23 Jul 2018 20:08:43 +0000 (04:08 +0800)
		1	2
components/driver/rtc_module.c	patch \|	diff1 \|	diff2 \|	blob \| history
components/esp32/sleep_modes.c	patch \|	diff1 \|	diff2 \|	blob \| history