Change related to upstream merge.

* STAND_ALONE conditional compilation is removed.
* Previous interim commits are squashed.
* printk.h is included from atomport.h
* atom-types.h and atommport-types.h have been removed.

Signed-off-by: Himanshu Chauhan <hschauhan@nulltrace.org>

kernel/atomsem.c

@@ -87,6 +87,12 @@
  *
  */
 
+<<<<<<< HEAD
+=======
+#ifndef STAND_ALONE
+#include <stdio.h>
+#endif
+>>>>>>> Change related to upstream merge.
 
 #include "atom.h"
 #include "atomsem.h"

tests/test-template.c

@@ -31,7 +31,6 @@
 #include "atom.h"
 #include "atomtests.h"
 
-
 /**
  * \b test_start
  *