Merge branch 'bugfix/wakeup_from_deep_sleep' into 'master'

author Angus Gratton <angus@espressif.com>

Fri, 8 Jun 2018 02:40:47 +0000 (10:40 +0800)

committer Angus Gratton <angus@espressif.com>

Fri, 8 Jun 2018 02:40:47 +0000 (10:40 +0800)
author Angus Gratton <angus@espressif.com>
Fri, 8 Jun 2018 02:40:47 +0000 (10:40 +0800)
committer Angus Gratton <angus@espressif.com>
Fri, 8 Jun 2018 02:40:47 +0000 (10:40 +0800)
diff --cc .gitlab-ci.yml
Simple merge
diff --cc components/esp32/sleep_modes.c
Simple merge
diff --cc components/newlib/time.c
Simple merge
author	Angus Gratton <angus@espressif.com>
	Fri, 8 Jun 2018 02:40:47 +0000 (10:40 +0800)
committer	Angus Gratton <angus@espressif.com>
	Fri, 8 Jun 2018 02:40:47 +0000 (10:40 +0800)
		1	2
.gitlab-ci.yml	patch \|	diff1 \|	diff2 \|	blob \| history
components/esp32/sleep_modes.c	patch \|	diff1 \|	diff2 \|	blob \| history
components/newlib/time.c	patch \|	diff1 \|	diff2 \|	blob \| history