Merge branch 'bugfix/add_mutex_for_some_touchpad_apis' into 'master'

author Angus Gratton <angus@espressif.com>

Wed, 8 Aug 2018 08:28:28 +0000 (16:28 +0800)

committer Angus Gratton <angus@espressif.com>

Wed, 8 Aug 2018 08:28:28 +0000 (16:28 +0800)
author Angus Gratton <angus@espressif.com>
Wed, 8 Aug 2018 08:28:28 +0000 (16:28 +0800)
committer Angus Gratton <angus@espressif.com>
Wed, 8 Aug 2018 08:28:28 +0000 (16:28 +0800)
diff --cc components/driver/include/driver/touch_pad.h
Simple merge
diff --cc components/driver/rtc_module.c
Simple merge
author	Angus Gratton <angus@espressif.com>
	Wed, 8 Aug 2018 08:28:28 +0000 (16:28 +0800)
committer	Angus Gratton <angus@espressif.com>
	Wed, 8 Aug 2018 08:28:28 +0000 (16:28 +0800)
		1	2
components/driver/include/driver/touch_pad.h	patch \|	diff1 \|	diff2 \|	blob \| history
components/driver/rtc_module.c	patch \|	diff1 \|	diff2 \|	blob \| history