Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 97c7682 in mainline

Timestamp:
2012-07-14T11:18:40Z (10 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial
Children:
804d9b6
Parents:
0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

Files:
74 added
77 deleted
266 edited
58 moved

Changeset view not shown, since the total size (5.1 MB) exceeds 976.6 KB

Note: See TracChangeset for help on using the changeset viewer.