Merge branch 'i2c_optimization' of

https://github.com/Zaltora/esp-open-rtos.git into i2c_optimization

Conflicts:
	extras/i2c/i2c.c
This commit is contained in:
lilian 2017-01-02 09:34:49 +01:00
commit 24bc42d952

Diff content is not available