Changeset b1c57a8 in mainline for kernel/arch/arm32/Makefile.inc


Ignore:
Timestamp:
2014-10-09T15:03:55Z (10 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e367939c
Parents:
21799398 (diff), 207e8880 (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 from lp:~adam-hraska+lp/helenos/rcu/.

Only merge from the feature branch and resolve all conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/arm32/Makefile.inc

    r21799398 rb1c57a8  
    6565        arch/$(KARCH)/src/mm/tlb.c \
    6666        arch/$(KARCH)/src/mm/page_fault.c \
     67        arch/$(KARCH)/src/atomic.c \
    6768        arch/$(KARCH)/src/ras.c
    6869
Note: See TracChangeset for help on using the changeset viewer.