Lok Tep 8aff3f15ca Merge remote-tracking branch 'remotes/parent/master' ... # Conflicts: # arch/arm/src/stm32f7/stm32_i2c.c # configs/stm32f746-ws/nsh/defconfig		2016-06-18 11:37:26 +02:00
..
board.h	Merge remote-tracking branch 'remotes/parent/master'	2016-06-18 11:37:26 +02:00