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	coding conventions for drivers	2013-06-21 22:36:48 +02:00
spi	fixed coding style (space after most keywords)	2013-06-24 22:37:35 +02:00
cc110x-defaultSettings.c	coding conventions for drivers	2013-06-21 22:36:48 +02:00
cc110x-rx.c	Merge branch 'thomas-mc1322x'	2013-07-24 23:22:11 +02:00
cc110x-tx.c	Merge branch 'thomas-mc1322x'	2013-07-24 23:22:11 +02:00
cc110x.c	Revert "removed redefined ENABLE_DEBUG"	2013-07-24 00:38:43 +02:00
Makefile	Merge branch 'wsn430'	2013-06-25 15:33:40 +02:00