Stefan Lankes 68564c3238 Merge branch 'tests' ... Conflicts: include/metalsvm/spinlock.h include/metalsvm/spinlock_types.h kernel/tasks.c		2011-04-18 15:36:22 +02:00
..
include/asm	Merge branch 'tests'	2011-04-18 15:36:22 +02:00
kernel	Merge branch 'tests'	2011-04-18 15:36:22 +02:00
mm	Merge branch 'master' of git.lfbs.rwth-aachen.de:metalsvm into doxygen	2011-04-14 08:40:52 +02:00
scc	Merge branch 'master' of git.lfbs.rwth-aachen.de:metalsvm into doxygen	2011-04-14 08:40:52 +02:00