2 Commits

Author	SHA1	Message	Date
Mariano Alvira	2c9a538582	Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into bump-libmc1322x ... bump libmc1322x to 7bee48243c Conflicts: cpu/mc1322x/board/Makefile.board cpu/mc1322x/lib/include/uart.h cpu/mc1322x/lib/uart1.c cpu/mc1322x/lib/uart2.c cpu/mc1322x/src/default_lowlevel.c	2012-11-18 18:27:39 -05:00
Mariano Alvira	e2d74fa0a5	Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into uart-upstream ... Conflicts: cpu/mc1322x/lib/include/uart.h cpu/mc1322x/src/default_lowlevel.c	2011-07-08 19:21:15 -04:00