Commit
Merge branch 'master' of https://github.com/dm13dv1b/STM32F4_ChibiOS

Conflicts:
	.cproject
	build/ch.dmp
	build/ch.elf
	build/ch.map
	build/lst/adc.lst
	build/lst/adc_lld.lst
	build/lst/board.lst
	build/lst/can.lst
	build/lst/can_lld.lst
	build/lst/chcond.lst
	build/lst/chcore.lst
	build/lst/chcore_v7m.lst
	build/lst/chdebug.lst
	build/lst/chdynamic.lst
	build/lst/chevents.lst
	build/lst/chheap.lst
	build/lst/chlists.lst
	build/lst/chmboxes.lst
	build/lst/chmemcore.lst
	build/lst/chmempools.lst
	build/lst/chmsg.lst
	build/lst/chmtx.lst
	build/lst/chprintf.lst
	build/lst/chqueues.lst
	build/lst/chregistry.lst
	build/lst/chschd.lst
	build/lst/chsem.lst
	build/lst/chsys.lst
	build/lst/chthreads.lst
	build/lst/chvt.lst
	build/lst/crt0.lst
	build/lst/ext.lst
	build/lst/ext_lld.lst
	build/lst/ext_lld_isr.lst
	build/lst/gpt.lst
	build/lst/gpt_lld.lst
	build/lst/hal.lst
	build/lst/hal_lld.lst
	build/lst/i2c.lst
	build/lst/i2c_lld.lst
	build/lst/icu.lst
	build/lst/icu_lld.lst
	build/lst/lis302dl.lst
	build/lst/mac.lst
	build/lst/mac_lld.lst
	build/lst/main.lst
	build/lst/mmc_spi.lst
	build/lst/mmcsd.lst
	build/lst/nvic.lst
	build/lst/pal.lst
	build/lst/pal_lld.lst
	build/lst/pwm.lst
	build/lst/pwm_lld.lst
	build/lst/rtc.lst
	build/lst/rtc_lld.lst
	build/lst/sdc.lst
	build/lst/sdc_lld.lst
	build/lst/serial.lst
	build/lst/serial_lld.lst
	build/lst/serial_usb.lst
	build/lst/spi.lst
	build/lst/spi_lld.lst
	build/lst/stm32_dma.lst
	build/lst/test.lst
	build/lst/testbmk.lst
	build/lst/testdyn.lst
	build/lst/testevt.lst
	build/lst/testheap.lst
	build/lst/testmbox.lst
	build/lst/testmsg.lst
	build/lst/testmtx.lst
	build/lst/testpools.lst
	build/lst/testqueues.lst
	build/lst/testsem.lst
	build/lst/testthd.lst
	build/lst/tm.lst
	build/lst/uart.lst
	build/lst/uart_lld.lst
	build/lst/usb.lst
	build/lst/usb_lld.lst
	build/lst/vectors.lst
	build/obj/adc.o
	build/obj/adc_lld.o
	build/obj/board.o
	build/obj/can.o
	build/obj/can_lld.o
	build/obj/chcond.o
	build/obj/chcore.o
	build/obj/chcore_v7m.o
	build/obj/chdebug.o
	build/obj/chdynamic.o
	build/obj/chevents.o
	build/obj/chheap.o
	build/obj/chlists.o
	build/obj/chmboxes.o
	build/obj/chmemcore.o
	build/obj/chmempools.o
	build/obj/chmsg.o
	build/obj/chmtx.o
	build/obj/chprintf.o
	build/obj/chqueues.o
	build/obj/chregistry.o
	build/obj/chschd.o
	build/obj/chsem.o
	build/obj/chsys.o
	build/obj/chthreads.o
	build/obj/chvt.o
	build/obj/crt0.o
	build/obj/ext.o
	build/obj/ext_lld.o
	build/obj/ext_lld_isr.o
	build/obj/gpt.o
	build/obj/gpt_lld.o
	build/obj/hal.o
	build/obj/hal_lld.o
	build/obj/i2c.o
	build/obj/i2c_lld.o
	build/obj/icu.o
	build/obj/icu_lld.o
	build/obj/lis302dl.o
	build/obj/mac.o
	build/obj/mac_lld.o
	build/obj/main.o
	build/obj/mmc_spi.o
	build/obj/mmcsd.o
	build/obj/nvic.o
	build/obj/pal.o
	build/obj/pal_lld.o
	build/obj/pwm.o
	build/obj/pwm_lld.o
	build/obj/rtc.o
	build/obj/rtc_lld.o
	build/obj/sdc.o
	build/obj/sdc_lld.o
	build/obj/serial.o
	build/obj/serial_lld.o
	build/obj/serial_usb.o
	build/obj/spi.o
	build/obj/spi_lld.o
	build/obj/stm32_dma.o
	build/obj/test.o
	build/obj/testbmk.o
	build/obj/testdyn.o
	build/obj/testevt.o
	build/obj/testheap.o
	build/obj/testmbox.o
	build/obj/testmsg.o
	build/obj/testmtx.o
	build/obj/testpools.o
	build/obj/testqueues.o
	build/obj/testsem.o
	build/obj/testthd.o
	build/obj/tm.o
	build/obj/uart.o
	build/obj/uart_lld.o
	build/obj/usb.o
	build/obj/usb_lld.o
	build/obj/vectors.o