Commit graph

5 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
724bcbd2d3 Merge remote branch 'libmc1322x/master'
Conflicts:
	cpu/mc1322x/src/default_lowlevel.c
2011-05-14 21:19:47 -04:00
Mariano Alvira
7cdfbb0947 remove cvs keywords from cpu/mc1322x 2011-02-17 14:36:55 -05:00
maralvira
8d2f740f7f Fix #ifdefs in board files 2010-11-07 14:18:54 +00:00
maralvira
bf9f960bbe add board files. 2010-06-10 14:48:32 +00:00