Skip to content
Commit 8aff3f15 authored by Lok Tep's avatar Lok Tep
Browse files

Merge remote-tracking branch 'remotes/parent/master' 

# Conflicts:
#	arch/arm/src/stm32f7/stm32_i2c.c
#	configs/stm32f746-ws/nsh/defconfig
parents 98e7e5c4 3fa41c0f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment