Changeset df29f24 in mainline for uspace/Makefile


Ignore:
Timestamp:
2011-06-01T09:04:08Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0a7627b, c9f0975
Parents:
e51a514 (diff), 5d1b3aa (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

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    re51a514 rdf29f24  
    9494        drv/rootvirt \
    9595        drv/test1 \
    96         drv/test2
     96        drv/test2 \
     97        drv/test3
    9798
    9899## Networking
Note: See TracChangeset for help on using the changeset viewer.