Changeset 95c675b in mainline for kernel/test/mm/slab2.c

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• kernel/test/mm/slab2.c (modified) (1 diff)

kernel/test/mm/slab2.c

@@ -33 +33 @@
 #include <arch.h>
 #include <mm/frame.h>
-#include <memstr.h>
+#include <mem.h>
 #include <synch/condvar.h>
 #include <synch/mutex.h>