Michael (XIAO Xufeng) c9ca1fbe78 Merge branch 'bugfix/fix_touch_sensor_api_backport_v4.1' into 'release/v4.1' ...

(High priority) driver(touch): fix touch sensor driver redundancy (backport v4.1)

See merge request espressif/esp-idf!9872

2020-08-23 16:08:49 +08:00

..

hal

Merge branch 'bugfix/fix_touch_sensor_api_backport_v4.1' into 'release/v4.1'

2020-08-23 16:08:49 +08:00

soc

Merge branch 'backport/feat/secure_boot_v2_v41' into 'release/v4.1'

2020-03-18 15:35:53 +08:00