Changeset 46c20c8 in mainline for kernel/test/test.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/test/test.c (modified) (2 diffs)

kernel/test/test.c

@@ -51 +51 @@
 #include <mm/slab1.def>
 #include <mm/slab2.def>
-#include <synch/rwlock1.def>
-#include <synch/rwlock2.def>
-#include <synch/rwlock3.def>
-#include <synch/rwlock4.def>
-#include <synch/rwlock5.def>
 #include <synch/semaphore1.def>
 #include <synch/semaphore2.def>
@@ -62 +57 @@
 #include <print/print3.def>
 #include <print/print4.def>
+#include <print/print5.def>
 #include <thread/thread1.def>
-#include <sysinfo/sysinfo1.def>
         {
                 .name = NULL,