Skip to content
Commit 5a8f395a authored by Lok Tep's avatar Lok Tep
Browse files

Merge remote-tracking branch 'parent/master' 

# Conflicts:
#	arch/arm/src/stm32f7/chip/stm32_spi.h
#	arch/arm/src/stm32f7/stm32_spi.c
#	arch/arm/src/stm32f7/stm32_spi.h
parents 4d8cc9f5 de008c28
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