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

..

doc

* import from old firekernel repository

2010-09-22 15:10:42 +02:00

gpioint

fixed coding style (space after most keywords)

2013-06-24 22:37:35 +02:00

include

redefining default stack sizes dependent on the use of printf

2013-07-23 13:42:58 +02:00

mci

Revert "removed redefined ENABLE_DEBUG"

2013-07-24 00:38:43 +02:00

rtc

Revert "removed redefined ENABLE_DEBUG"

2013-07-24 00:38:43 +02:00

tools

* import from old firekernel repository

2010-09-22 15:10:42 +02:00

asmfunc.s

[cpu lpc2387]

2011-12-12 17:50:22 +01:00

cpu.c

fixed coding style (space after most keywords)

2013-06-24 22:37:35 +02:00

linkerscript.x

Merge branch 'mc1322x' of github.com:RIOT-OS/RIOT into mc1322x

2013-04-22 09:56:07 +02:00

lpc23xx-iap.c

fixed coding style (space after most keywords)

2013-06-24 22:37:35 +02:00

lpc2387-adc.c

fixed some includes

2013-07-24 00:44:28 +02:00

lpc2387-lpm.c

Revert "removed redefined ENABLE_DEBUG"

2013-07-24 00:38:43 +02:00

Makefile

* replaced new Makefile name in Makefiles

2013-03-09 23:47:21 +01:00

startup.s

* massive name changes

2010-10-28 11:29:03 +02:00