Changeset bd48f4c in mainline for kernel/test/test.c


Ignore:
Timestamp:
2010-07-12T10:53:30Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bd11d3e
Parents:
c40e6ef (diff), bee2d4c (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:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/test/test.c

    rc40e6ef rbd48f4c  
    5151#include <mm/slab1.def>
    5252#include <mm/slab2.def>
    53 #include <synch/rwlock1.def>
    54 #include <synch/rwlock2.def>
    55 #include <synch/rwlock3.def>
    56 #include <synch/rwlock4.def>
    57 #include <synch/rwlock5.def>
    5853#include <synch/semaphore1.def>
    5954#include <synch/semaphore2.def>
Note: See TracChangeset for help on using the changeset viewer.