Changeset b678410 in mainline for kernel/Makefile


Ignore:
Timestamp:
2011-04-27T20:01:13Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a6dffb8
Parents:
628d548 (diff), 933cadf (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/Makefile

    r628d548 rb678410  
    226226        generic/src/proc/task.c \
    227227        generic/src/proc/the.c \
    228         generic/src/proc/tasklet.c \
    229228        generic/src/syscall/syscall.c \
    230229        generic/src/syscall/copy.c \
     230        generic/src/mm/reserve.c \
    231231        generic/src/mm/buddy.c \
    232232        generic/src/mm/frame.c \
    … …  
    382382                generic/src/main/kinit.c \
    383383                generic/src/proc/the.c \
    384                 generic/src/proc/tasklet.c \
    385384                generic/src/mm/frame.c \
    386385                generic/src/mm/page.c \
Note: See TracChangeset for help on using the changeset viewer.