Changeset 00aece0 in mainline for kernel/Makefile

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/Makefile (modified) (2 diffs)

kernel/Makefile

@@ -229 +229 @@
         generic/src/syscall/syscall.c \
         generic/src/syscall/copy.c \
+        generic/src/mm/km.c \
         generic/src/mm/reserve.c \
         generic/src/mm/buddy.c \
@@ -245 +246 @@
         generic/src/lib/str.c \
         generic/src/lib/elf.c \
+        generic/src/lib/ra.c \
         generic/src/lib/rd.c \
         generic/src/printf/printf_core.c \