Changeset f126c87 in mainline for kernel/arch/ia32/src/ia32.c

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 mainline.

File:

• kernel/arch/ia32/src/ia32.c (modified) (1 diff)

kernel/arch/ia32/src/ia32.c

@@ -143 +143 @@
                 zone_merge_all();
         }
-
 }