Oleg Hahm 19e4034ace Merge branch 'thomas-mc1322x' ... Conflicts: Makefile.modules core/kernel_init.c core/thread.c cpu/arm_common/arm_cpu.c cpu/arm_common/syscalls.c cpu/lpc_common/hwtimer_cpu.c cpu/lpc_common/iap.c sys/include/transceiver.h sys/net/sixlowpan/sixlowip.c sys/net/sixlowpan/sixlowmac.c sys/net/sixlowpan/sixlowmac.h sys/net/sixlowpan/sixlowpan.c sys/transceiver/Makefile sys/transceiver/transceiver.c		2013-07-24 23:22:11 +02:00
..
include	fixed coding conventions (mostly by astyle)	2013-06-21 03:52:57 +02:00
arm_cpu.c	Merge branch 'thomas-mc1322x'	2013-07-24 23:22:11 +02:00
atomic.s	* massive name changes	2010-10-28 11:29:03 +02:00
bootloader.c	fixed coding style (space after most keywords)	2013-06-24 22:37:35 +02:00
common.s	* massive name changes	2010-10-28 11:29:03 +02:00
Makefile	Use basic CFLAGS for ARM bootloader code	2013-07-24 22:22:34 +02:00
syscalls.c	Merge branch 'thomas-mc1322x'	2013-07-24 23:22:11 +02:00
VIC.c	fixed coding conventions (mostly by astyle)	2013-06-21 03:52:57 +02:00