Stefan Lankes bdebe44a26 Merge branch 'stage5' into stage6 ... Conflicts: arch/x86/include/asm/page.h arch/x86/kernel/entry.asm arch/x86/mm/page.c		2015-01-17 16:45:06 +01:00
..
eduos	Merge branch 'stage5' into stage6	2015-01-17 16:45:06 +01:00