02ea612142
Merge remote-tracking branch 'schodet/master' Conflicts: include/libopencm3/stm32/f1/adc.h
Merge remote-tracking branch 'schodet/master' Conflicts: include/libopencm3/stm32/f1/adc.h