Merge branch 'mips32-port'

Conflicts:
	kernel/atomsem.c
	ports/mips/tests-main.c

Signed-off-by: Himanshu Chauhan <hschauhan@nulltrace.org>
This commit is contained in:
Himanshu Chauhan
2011-05-28 09:11:17 +05:30
2 changed files with 1 additions and 3 deletions

View File

@@ -31,7 +31,6 @@
#include "atom.h"
#include "atomtests.h"
/**
* \b test_start
*
@@ -53,4 +52,4 @@ uint32_t test_start (void)
/* Quit */
return failures;
}
}

View File

@@ -32,7 +32,6 @@
#include "atomtimer.h"
#include "atomtests.h"
/* Global test data */
static volatile int callback_ran_flag;